Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/codegen/AssignSymbols.java	Mon Aug 25 17:38:53 2014 +0400
     1.2 +++ b/src/jdk/nashorn/internal/codegen/AssignSymbols.java	Wed Aug 27 14:58:28 2014 +0200
     1.3 @@ -485,7 +485,7 @@
     1.4          if (functionNode.isDeclared()) {
     1.5              final Iterator<Block> blocks = lc.getBlocks();
     1.6              if (blocks.hasNext()) {
     1.7 -                defineSymbol(blocks.next(), functionNode.getIdent().getName(), IS_VAR);
     1.8 +                defineSymbol(blocks.next(), functionNode.getIdent().getName(), IS_VAR | (functionNode.isAnonymous()? IS_INTERNAL : 0));
     1.9              }
    1.10          }
    1.11  

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8056123.js	Wed Aug 27 14:58:28 2014 +0200
     2.3 @@ -0,0 +1,45 @@
     2.4 +/*
     2.5 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + *
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + *
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + *
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + *
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/**
    2.28 + * JDK-8056123: Anonymous function statements leak internal function names into global scope
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +// do *not* introduce newlines before this line!
    2.35 +function () { // line 32
    2.36 +  print("hello function!");
    2.37 +}
    2.38 +
    2.39 +if (typeof this["L:32"] != 'undefined') {
    2.40 +   fail("anonymous function statement leaks name in global");
    2.41 +}
    2.42 +
    2.43 +var keys = Object.keys(this);
    2.44 +for (var i in keys) {
    2.45 +    if (keys[i].contains("L:")) {
    2.46 +        fail("found " + keys[i] + " in global scope");
    2.47 +    }
    2.48 +}

     3.1 --- a/test/src/jdk/nashorn/api/scripting/ScriptObjectMirrorTest.java	Mon Aug 25 17:38:53 2014 +0400
     3.2 +++ b/test/src/jdk/nashorn/api/scripting/ScriptObjectMirrorTest.java	Wed Aug 27 14:58:28 2014 +0200
     3.3 @@ -374,4 +374,13 @@
     3.4          final Object global = e.eval("this");
     3.5          assertFalse(global.equals(jsobj.eval("this")));
     3.6      }
     3.7 +
     3.8 +    @Test
     3.9 +    public void topLevelAnonFuncStatement() throws Exception {
    3.10 +        final ScriptEngineManager engineManager = new ScriptEngineManager();
    3.11 +        final ScriptEngine e = engineManager.getEngineByName("nashorn");
    3.12 +        final JSObject func = (JSObject)e.eval("function(x) { return x + ' world' }");
    3.13 +        assertTrue(func.isFunction());
    3.14 +        assertEquals(func.call(e.eval("this"), "hello"), "hello world");
    3.15 +    }
    3.16  }