src/jdk/nashorn/internal/runtime/ScriptFunction.java

Print this page

        

*** 36,45 **** --- 36,46 ---- import jdk.internal.dynalink.CallSiteDescriptor; import jdk.internal.dynalink.linker.GuardedInvocation; import jdk.internal.dynalink.linker.LinkRequest; import jdk.nashorn.internal.codegen.CompilerConstants.Call; import jdk.nashorn.internal.lookup.MethodHandleFactory; + import jdk.nashorn.internal.objects.Global; import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor; import jdk.nashorn.internal.runtime.linker.NashornGuards; /** * Runtime representation of a JavaScript function.
*** 473,490 **** @SuppressWarnings("unused") private static Object wrapFilter(final Object obj) { if (obj instanceof ScriptObject || !ScriptFunctionData.isPrimitiveThis(obj)) { return obj; } ! return ((GlobalObject)Context.getGlobalTrusted()).wrapAsObject(obj); } @SuppressWarnings("unused") private static Object globalFilter(final Object object) { // replace whatever we get with the current global object ! return Context.getGlobalTrusted(); } /** * dyn:call call site signature: (callee, thiz, [args...]) * generated method signature: (callee, thiz, [args...]) --- 474,491 ---- @SuppressWarnings("unused") private static Object wrapFilter(final Object obj) { if (obj instanceof ScriptObject || !ScriptFunctionData.isPrimitiveThis(obj)) { return obj; } ! return Context.getGlobal().wrapAsObject(obj); } @SuppressWarnings("unused") private static Object globalFilter(final Object object) { // replace whatever we get with the current global object ! return Context.getGlobal(); } /** * dyn:call call site signature: (callee, thiz, [args...]) * generated method signature: (callee, thiz, [args...])