stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8159977: typeof operator does not see lexical bindings declared in other scripts

Browse Source 
Reviewed-by: sundar
This commit is contained in:
Hannes Wallnöfer 2016-06-22 16:30:41 +02:00
parent 491d8743c3
commit d172b7b70b
5 changed files with 64 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java
View File

@ -2474,14 +2474,14 @@ public final class Global extends Scope {
}
@Override
protected FindProperty findProperty(final Object key, final boolean deep, final ScriptObject start) {
if (lexicalScope != null && start != this && start.isScope()) {
protected FindProperty findProperty(final Object key, final boolean deep, boolean isScope, final ScriptObject start) {
if (lexicalScope != null && isScope) {
final FindProperty find = lexicalScope.findProperty(key, false);
if (find != null) {
return find;
}
}
return super.findProperty(key, deep, start);
return super.findProperty(key, deep, isScope, start);
}
@Override

25
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java
View File

@ -775,7 +775,7 @@ public abstract class ScriptObject implements PropertyAccess, Cloneable {
* @return FindPropertyData or null if not found.
*/
public final FindProperty findProperty(final Object key, final boolean deep) {
return findProperty(key, deep, this);
return findProperty(key, deep, false, this);
}
/**
@ -791,12 +791,12 @@ public abstract class ScriptObject implements PropertyAccess, Cloneable {
* @see jdk.nashorn.internal.objects.NativeArray
*
* @param key Property key.
* @param deep Whether the search should look up proto chain.
* @param deep true if the search should look up proto chain
* @param isScope true if this is a scope access
* @param start the object on which the lookup was originally initiated
*
* @return FindPropertyData or null if not found.
*/
protected FindProperty findProperty(final Object key, final boolean deep, final ScriptObject start) {
protected FindProperty findProperty(final Object key, final boolean deep, boolean isScope, final ScriptObject start) {
final PropertyMap selfMap = getMap();
final Property property = selfMap.findProperty(key);
@ -807,7 +807,7 @@ public abstract class ScriptObject implements PropertyAccess, Cloneable {
if (deep) {
final ScriptObject myProto = getProto();
final FindProperty find = myProto == null ? null : myProto.findProperty(key, true, start);
final FindProperty find = myProto == null ? null : myProto.findProperty(key, true, isScope, start);
// checkSharedProtoMap must be invoked after myProto.checkSharedProtoMap to propagate
// shared proto invalidation up the prototype chain. It also must be invoked when prototype is null.
checkSharedProtoMap();
@ -1977,7 +1977,7 @@ public abstract class ScriptObject implements PropertyAccess, Cloneable {
return findMegaMorphicGetMethod(desc, name, operation == StandardOperation.GET_METHOD);
}
final FindProperty find = findProperty(name, true);
final FindProperty find = findProperty(name, true, NashornCallSiteDescriptor.isScope(desc), this);
MethodHandle mh;
if (find == null) {
@ -2035,7 +2035,7 @@ public abstract class ScriptObject implements PropertyAccess, Cloneable {
}
private static GuardedInvocation findMegaMorphicGetMethod(final CallSiteDescriptor desc, final String name, final boolean isMethod) {
Context.getContextTrusted().getLogger(ObjectClassGenerator.class).warning("Megamorphic getter: " + desc + " " + name + " " +isMethod);
Context.getContextTrusted().getLogger(ObjectClassGenerator.class).warning("Megamorphic getter: ", desc, " ", name + " ", isMethod);
final MethodHandle invoker = MH.insertArguments(MEGAMORPHIC_GET, 1, name, isMethod, NashornCallSiteDescriptor.isScope(desc));
final MethodHandle guard = getScriptObjectGuard(desc.getMethodType(), true);
return new GuardedInvocation(invoker, guard);
@ -2043,7 +2043,7 @@ public abstract class ScriptObject implements PropertyAccess, Cloneable {
@SuppressWarnings("unused")
private Object megamorphicGet(final String key, final boolean isMethod, final boolean isScope) {
final FindProperty find = findProperty(key, true);
final FindProperty find = findProperty(key, true, isScope, this);
if (find != null) {
return find.getObjectValue();
}
@ -2181,7 +2181,7 @@ public abstract class ScriptObject implements PropertyAccess, Cloneable {
*
* toString = function() { print("global toString"); } // don't affect Object.prototype.toString
*/
FindProperty find = findProperty(name, true, this);
FindProperty find = findProperty(name, true, NashornCallSiteDescriptor.isScope(desc), this);
// If it's not a scope search, then we don't want any inherited properties except those with user defined accessors.
if (find != null && find.isInherited() && !find.getProperty().isAccessorProperty()) {
@ -2258,6 +2258,7 @@ public abstract class ScriptObject implements PropertyAccess, Cloneable {
}
private GuardedInvocation findMegaMorphicSetMethod(final CallSiteDescriptor desc, final String name) {
Context.getContextTrusted().getLogger(ObjectClassGenerator.class).warning("Megamorphic setter: ", desc, " ", name);
final MethodType type = desc.getMethodType().insertParameterTypes(1, Object.class);
//never bother with ClassCastExceptionGuard for megamorphic callsites
final GuardedInvocation inv = findSetIndexMethod(getClass(), desc, false, type);
@ -2734,7 +2735,7 @@ public abstract class ScriptObject implements PropertyAccess, Cloneable {
if (isValidArrayIndex(index)) {
for (ScriptObject object = this; ; ) {
if (object.getMap().containsArrayKeys()) {
final FindProperty find = object.findProperty(key, false, this);
final FindProperty find = object.findProperty(key, false);
if (find != null) {
return getIntValue(find, programPoint);
@ -2805,7 +2806,7 @@ public abstract class ScriptObject implements PropertyAccess, Cloneable {
if (isValidArrayIndex(index)) {
for (ScriptObject object = this; ; ) {
if (object.getMap().containsArrayKeys()) {
final FindProperty find = object.findProperty(key, false, this);
final FindProperty find = object.findProperty(key, false);
if (find != null) {
return getDoubleValue(find, programPoint);
}
@ -2875,7 +2876,7 @@ public abstract class ScriptObject implements PropertyAccess, Cloneable {
if (isValidArrayIndex(index)) {
for (ScriptObject object = this; ; ) {
if (object.getMap().containsArrayKeys()) {
final FindProperty find = object.findProperty(key, false, this);
final FindProperty find = object.findProperty(key, false);
if (find != null) {
return find.getObjectValue();

12
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java
View File

@ -704,7 +704,17 @@ public final class ScriptRuntime {
if (property != null) {
if (obj instanceof ScriptObject) {
obj = ((ScriptObject)obj).get(property);
// this is a scope identifier
assert property instanceof String;
final ScriptObject sobj = (ScriptObject) obj;
final FindProperty find = sobj.findProperty(property, true, true, sobj);
if (find != null) {
obj = find.getObjectValue();
} else {
obj = sobj.invokeNoSuchProperty(property, false, UnwarrantedOptimismException.INVALID_PROGRAM_POINT);
}
if(Global.isLocationPropertyPlaceholder(obj)) {
if(CompilerConstants.__LINE__.name().equals(property)) {
obj = 0;

8
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java
View File

@ -193,20 +193,20 @@ public final class WithObject extends Scope {
*
* @param key Property key.
* @param deep Whether the search should look up proto chain.
* @param isScope true if is this a scope access
* @param start the object on which the lookup was originally initiated
*
* @return FindPropertyData or null if not found.
*/
@Override
protected FindProperty findProperty(final Object key, final boolean deep, final ScriptObject start) {
protected FindProperty findProperty(final Object key, final boolean deep, boolean isScope, final ScriptObject start) {
// We call findProperty on 'expression' with 'expression' itself as start parameter.
// This way in ScriptObject.setObject we can tell the property is from a 'with' expression
// (as opposed from another non-scope object in the proto chain such as Object.prototype).
final FindProperty exprProperty = expression.findProperty(key, true, expression);
final FindProperty exprProperty = expression.findProperty(key, true, false, expression);
if (exprProperty != null) {
return exprProperty;
}
return super.findProperty(key, deep, start);
return super.findProperty(key, deep, isScope, start);
}
@Override

41
nashorn/test/src/jdk/nashorn/internal/runtime/test/LexicalBindingTest.java
View File

@ -46,8 +46,8 @@ import static org.testng.Assert.assertEquals;
public class LexicalBindingTest {
final static String LANGUAGE_ES6 = "--language=es6";
final static int NUMBER_OF_CONTEXTS = 20;
final static int MEGAMORPHIC_LOOP_COUNT = 20;
final static int NUMBER_OF_CONTEXTS = 40;
final static int MEGAMORPHIC_LOOP_COUNT = 40;
/**
* Test access to global var-declared variables for shared script classes with multiple globals.
@ -57,19 +57,21 @@ public class LexicalBindingTest {
final NashornScriptEngineFactory factory = new NashornScriptEngineFactory();
final ScriptEngine e = factory.getScriptEngine();
final ScriptContext[] contexts = new ScriptContext[NUMBER_OF_CONTEXTS];
final String sharedScript = "foo";
final String sharedScript1 = "foo";
final String sharedScript2 = "bar = foo; bar";
for (int i = 0; i < NUMBER_OF_CONTEXTS; i++) {
final ScriptContext context = contexts[i] = new SimpleScriptContext();
final Bindings b = e.createBindings();
context.setBindings(b, ScriptContext.ENGINE_SCOPE);
assertEquals(e.eval("var foo = '" + i + "';", context), null);
assertEquals(e.eval("var foo = '" + i + "'; var bar;", context), null);
}
for (int i = 0; i < NUMBER_OF_CONTEXTS; i++) {
final ScriptContext context = contexts[i];
assertEquals(e.eval(sharedScript, context), String.valueOf(i));
assertEquals(e.eval(sharedScript1, context), String.valueOf(i));
assertEquals(e.eval(sharedScript2, context), String.valueOf(i));
}
}
@ -81,19 +83,21 @@ public class LexicalBindingTest {
final NashornScriptEngineFactory factory = new NashornScriptEngineFactory();
final ScriptEngine e = factory.getScriptEngine(LANGUAGE_ES6);
final ScriptContext[] contexts = new ScriptContext[NUMBER_OF_CONTEXTS];
final String sharedScript = "foo";
final String sharedScript1 = "foo";
final String sharedScript2 = "bar = foo; bar";
for (int i = 0; i < NUMBER_OF_CONTEXTS; i++) {
final ScriptContext context = contexts[i] = new SimpleScriptContext();
final Bindings b = e.createBindings();
context.setBindings(b, ScriptContext.ENGINE_SCOPE);
assertEquals(e.eval("let foo = '" + i + "';", context), null);
assertEquals(e.eval("let foo = '" + i + "'; let bar; ", context), null);
}
for (int i = 0; i < NUMBER_OF_CONTEXTS; i++) {
final ScriptContext context = contexts[i];
assertEquals(e.eval(sharedScript, context), String.valueOf(i));
assertEquals(e.eval(sharedScript1, context), String.valueOf(i));
assertEquals(e.eval(sharedScript2, context), String.valueOf(i));
}
}
@ -182,6 +186,27 @@ public class LexicalBindingTest {
assertEquals(e.eval(sharedScript, newCtxt), "newer context");
}
/**
* Make sure lexically defined variables are accessible in other scripts.
*/
@Test
public void lexicalScopeTest() throws ScriptException {
final NashornScriptEngineFactory factory = new NashornScriptEngineFactory();
final ScriptEngine e = factory.getScriptEngine(LANGUAGE_ES6);
e.eval("let x; const y = 'world';");
assertEquals(e.eval("x = 'hello'"), "hello");
assertEquals(e.eval("typeof x"), "string");
assertEquals(e.eval("typeof y"), "string");
assertEquals(e.eval("x"), "hello");
assertEquals(e.eval("y"), "world");
assertEquals(e.eval("typeof this.x"), "undefined");
assertEquals(e.eval("typeof this.y"), "undefined");
assertEquals(e.eval("this.x"), null);
assertEquals(e.eval("this.y"), null);
}
private static class ScriptRunner implements Runnable {
final ScriptEngine engine;