jdk8/jdk8/nashorn: 5759f600fcf7 (original) (raw)

--- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java Wed Mar 06 22:38:18 2013 +0530 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java Sat Mar 09 21:49:32 2013 +0530 @@ -28,12 +28,12 @@ import java.lang.invoke.MethodHandle; import java.lang.reflect.Method; import jdk.internal.org.objectweb.asm.Type; +import jdk.nashorn.internal.lookup.Lookup; import jdk.nashorn.internal.objects.PrototypeObject; import jdk.nashorn.internal.objects.ScriptFunctionImpl; import jdk.nashorn.internal.runtime.PropertyMap; import jdk.nashorn.internal.runtime.ScriptFunction; import jdk.nashorn.internal.runtime.ScriptObject; -import jdk.nashorn.internal.runtime.linker.Lookup; /**

--- a/make/java.security.override Wed Mar 06 22:38:18 2013 +0530 +++ b/make/java.security.override Sat Mar 09 21:49:32 2013 +0530 @@ -11,4 +11,4 @@

passed to checkPackageAccess unless the

corresponding RuntimePermission ("accessClassInPackage."+package) has

been granted.

-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.,jdk.nashorn.internal.ir., jdk.nashorn.internal.codegen., jdk.nashorn.internal.parser. +package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.,jdk.nashorn.internal.ir., jdk.nashorn.internal.codegen., jdk.nashorn.internal.lookup., jdk.nashorn.internal.parser.

--- a/src/jdk/internal/dynalink/beans/CheckRestrictedPackage.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/internal/dynalink/beans/CheckRestrictedPackage.java Sat Mar 09 21:49:32 2013 +0530 @@ -84,26 +84,55 @@ package jdk.internal.dynalink.beans; import java.lang.reflect.Modifier; +import java.security.AccessControlContext; +import java.security.AccessController; +import java.security.Permissions; +import java.security.PrivilegedAction; +import java.security.ProtectionDomain; /**

+ /** * Returns true if the class is either not public, or it resides in a package with restricted access. * @param clazz the class to test * @return true if the class is either not public, or it resides in a package with restricted access. */ static boolean isRestrictedClass(Class<?> clazz) {

--- a/src/jdk/internal/dynalink/beans/CheckRestrictedPackageInternal.java Wed Mar 06 22:38:18 2013 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,252 +0,0 @@ -/*

-

-

-

-

-*/ - -package jdk.internal.dynalink.beans; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; -import java.lang.reflect.Method; -import java.security.AccessController; -import java.security.Permissions; -import java.security.PrivilegedAction; -import java.security.ProtectionDomain; -import java.security.SecureClassLoader; - -/**

-

-

-

-

-

-

-

-

-}

--- a/src/jdk/internal/dynalink/beans/FacetIntrospector.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/internal/dynalink/beans/FacetIntrospector.java Sat Mar 09 21:49:32 2013 +0530 @@ -92,7 +92,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; -import jdk.internal.dynalink.support.Lookup; /**

MethodHandle unreflectGetter(Field field) {

--- a/src/jdk/internal/dynalink/beans/RestrictedPackageTester.java Wed Mar 06 22:38:18 2013 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,113 +0,0 @@ -/*

-

-

-

-

-*/ - -package jdk.internal.dynalink.beans; - -import java.security.AccessController; -import java.security.PrivilegedAction; - -/**

-

-

-

-}

--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk/internal/dynalink/beans/SafeUnreflector.java Sat Mar 09 21:49:32 2013 +0530 @@ -0,0 +1,156 @@ +/*

+

+

+

+

+*/ + +package jdk.internal.dynalink.beans; + +import java.lang.invoke.MethodHandle; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.security.AccessController; +import java.security.PrivilegedAction; +import jdk.internal.dynalink.beans.sandbox.Unreflector; + +/**

+

+

+

+

+

+

+}

--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk/internal/dynalink/beans/SafeUnreflectorImpl.java Sat Mar 09 21:49:32 2013 +0530 @@ -0,0 +1,146 @@ +/*

+

+

+

+

+*/ + +package jdk.internal.dynalink.beans; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import jdk.internal.dynalink.beans.sandbox.Unreflector; + +/**

+

+

+

+

+}

--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk/internal/dynalink/beans/SandboxClassLoader.java Sat Mar 09 21:49:32 2013 +0530 @@ -0,0 +1,228 @@ +/*

+

+

+

+

+*/ + +package jdk.internal.dynalink.beans; + +import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static jdk.internal.org.objectweb.asm.Opcodes.ASM4; + +import java.io.IOException; +import java.io.InputStream; +import java.security.Permissions; +import java.security.ProtectionDomain; +import java.security.SecureClassLoader; +import java.security.SecureRandom; +import jdk.internal.org.objectweb.asm.ClassReader; +import jdk.internal.org.objectweb.asm.ClassVisitor; +import jdk.internal.org.objectweb.asm.ClassWriter; +import jdk.internal.org.objectweb.asm.MethodVisitor; + +/**

+

+

+

+

+

+

+

+

+}

--- a/src/jdk/internal/dynalink/beans/StaticClassLinker.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/internal/dynalink/beans/StaticClassLinker.java Sat Mar 09 21:49:32 2013 +0530 @@ -138,7 +138,7 @@ final Constructor<?>[] ctrs = clazz.getConstructors(); final List mhs = new ArrayList<>(ctrs.length); for(int i = 0; i < ctrs.length; ++i) {

--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk/internal/dynalink/beans/sandbox/Unreflector.java Sat Mar 09 21:49:32 2013 +0530 @@ -0,0 +1,132 @@ +/*

+

+

+

+

+*/ + +package jdk.internal.dynalink.beans.sandbox; + +import java.lang.invoke.MethodHandle; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; + +/**

+

+

+

+ +}

--- a/src/jdk/nashorn/internal/codegen/CompilerConstants.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/codegen/CompilerConstants.java Sat Mar 09 21:49:32 2013 +0530 @@ -25,7 +25,7 @@ package jdk.nashorn.internal.codegen; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles;

--- a/src/jdk/nashorn/internal/codegen/FunctionSignature.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/codegen/FunctionSignature.java Sat Mar 09 21:49:32 2013 +0530 @@ -25,7 +25,7 @@ package jdk.nashorn.internal.codegen; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodType; import java.util.ArrayList;

--- a/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java Sat Mar 09 21:49:32 2013 +0530 @@ -34,7 +34,7 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.MAP; import static jdk.nashorn.internal.codegen.CompilerConstants.className; import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles;

--- a/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java Sat Mar 09 21:49:32 2013 +0530 @@ -28,7 +28,7 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup; import static jdk.nashorn.internal.codegen.types.Type.BOOLEAN; import static jdk.nashorn.internal.codegen.types.Type.INT; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.CallSite; import java.lang.invoke.MethodHandle; @@ -43,8 +43,8 @@ import jdk.nashorn.internal.ir.RuntimeNode.Request; import jdk.nashorn.internal.runtime.ScriptRuntime; import jdk.nashorn.internal.runtime.linker.Bootstrap; -import jdk.nashorn.internal.runtime.linker.Lookup; -import jdk.nashorn.internal.runtime.linker.MethodHandleFactory; +import jdk.nashorn.internal.lookup.Lookup; +import jdk.nashorn.internal.lookup.MethodHandleFactory; /**

--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk/nashorn/internal/lookup/Lookup.java Sat Mar 09 21:49:32 2013 +0530 @@ -0,0 +1,212 @@ +/*

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+ +}

--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk/nashorn/internal/lookup/MethodHandleFactory.java Sat Mar 09 21:49:32 2013 +0530 @@ -0,0 +1,646 @@ +/*

+

+

+

+

+

+

+

+

+

+ +

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+ +

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+ +

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+}

--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java Sat Mar 09 21:49:32 2013 +0530 @@ -0,0 +1,317 @@ +/*

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+} +

--- a/src/jdk/nashorn/internal/objects/Global.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/objects/Global.java Sat Mar 09 21:49:32 2013 +0530 @@ -27,7 +27,7 @@ import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.io.IOException; import java.io.PrintWriter;

--- a/src/jdk/nashorn/internal/objects/NativeArguments.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeArguments.java Sat Mar 09 21:49:32 2013 +0530 @@ -28,7 +28,7 @@ import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndexNoThrow; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -42,7 +42,7 @@ import jdk.nashorn.internal.runtime.ScriptRuntime; import jdk.nashorn.internal.runtime.arrays.ArrayData; import jdk.nashorn.internal.runtime.arrays.ArrayIndex; -import jdk.nashorn.internal.runtime.linker.Lookup; +import jdk.nashorn.internal.lookup.Lookup; /**

--- a/src/jdk/nashorn/internal/objects/NativeBoolean.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeBoolean.java Sat Mar 09 21:49:32 2013 +0530 @@ -26,7 +26,7 @@ package jdk.nashorn.internal.objects; import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -39,7 +39,7 @@ import jdk.nashorn.internal.runtime.JSType; import jdk.nashorn.internal.runtime.ScriptObject; import jdk.nashorn.internal.runtime.ScriptRuntime; -import jdk.nashorn.internal.runtime.linker.MethodHandleFactory; +import jdk.nashorn.internal.lookup.MethodHandleFactory; import jdk.nashorn.internal.runtime.linker.PrimitiveLookup; /**

--- a/src/jdk/nashorn/internal/objects/NativeError.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeError.java Sat Mar 09 21:49:32 2013 +0530 @@ -26,7 +26,7 @@ package jdk.nashorn.internal.objects; import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles;

--- a/src/jdk/nashorn/internal/objects/NativeJSAdapter.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeJSAdapter.java Sat Mar 09 21:49:32 2013 +0530 @@ -27,7 +27,7 @@ import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -46,8 +46,8 @@ import jdk.nashorn.internal.runtime.ScriptObject; import jdk.nashorn.internal.runtime.ScriptRuntime; import jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator; -import jdk.nashorn.internal.runtime.linker.Lookup; -import jdk.nashorn.internal.runtime.linker.MethodHandleFactory; +import jdk.nashorn.internal.lookup.Lookup; +import jdk.nashorn.internal.lookup.MethodHandleFactory; /**

--- a/src/jdk/nashorn/internal/objects/NativeNumber.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeNumber.java Sat Mar 09 21:49:32 2013 +0530 @@ -30,7 +30,7 @@ import static jdk.nashorn.internal.runtime.JSType.isRepresentableAsInt; import static jdk.nashorn.internal.runtime.JSType.isRepresentableAsLong; import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -47,7 +47,7 @@ import jdk.nashorn.internal.runtime.JSType; import jdk.nashorn.internal.runtime.ScriptObject; import jdk.nashorn.internal.runtime.ScriptRuntime; -import jdk.nashorn.internal.runtime.linker.MethodHandleFactory; +import jdk.nashorn.internal.lookup.MethodHandleFactory; import jdk.nashorn.internal.runtime.linker.PrimitiveLookup; /**

--- a/src/jdk/nashorn/internal/objects/NativeStrictArguments.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeStrictArguments.java Sat Mar 09 21:49:32 2013 +0530 @@ -26,7 +26,7 @@ package jdk.nashorn.internal.objects; import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -36,7 +36,7 @@ import jdk.nashorn.internal.runtime.ScriptFunction; import jdk.nashorn.internal.runtime.ScriptObject; import jdk.nashorn.internal.runtime.arrays.ArrayData; -import jdk.nashorn.internal.runtime.linker.Lookup; +import jdk.nashorn.internal.lookup.Lookup; /**

--- a/src/jdk/nashorn/internal/objects/NativeString.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeString.java Sat Mar 09 21:49:32 2013 +0530 @@ -29,7 +29,7 @@ import static jdk.nashorn.internal.runtime.JSType.isRepresentableAsInt; import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndexNoThrow; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -55,7 +55,7 @@ import jdk.nashorn.internal.runtime.ScriptObject; import jdk.nashorn.internal.runtime.ScriptRuntime; import jdk.nashorn.internal.runtime.arrays.ArrayIndex; -import jdk.nashorn.internal.runtime.linker.MethodHandleFactory; +import jdk.nashorn.internal.lookup.MethodHandleFactory; import jdk.nashorn.internal.runtime.linker.NashornGuards; import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;

--- a/src/jdk/nashorn/internal/objects/PrototypeObject.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/objects/PrototypeObject.java Sat Mar 09 21:49:32 2013 +0530 @@ -26,7 +26,7 @@ package jdk.nashorn.internal.objects; import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -34,7 +34,7 @@ import jdk.nashorn.internal.runtime.PropertyMap; import jdk.nashorn.internal.runtime.ScriptFunction; import jdk.nashorn.internal.runtime.ScriptObject; -import jdk.nashorn.internal.runtime.linker.Lookup; +import jdk.nashorn.internal.lookup.Lookup; /**

--- a/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java Sat Mar 09 21:49:32 2013 +0530 @@ -34,7 +34,7 @@ import jdk.nashorn.internal.runtime.ScriptFunction; import jdk.nashorn.internal.runtime.ScriptFunctionData; import jdk.nashorn.internal.runtime.ScriptObject; -import jdk.nashorn.internal.runtime.linker.Lookup; +import jdk.nashorn.internal.lookup.Lookup; /**

--- a/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java Sat Mar 09 21:49:32 2013 +0530 @@ -1,6 +1,6 @@ package jdk.nashorn.internal.objects; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles;

--- a/src/jdk/nashorn/internal/runtime/AccessorProperty.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/AccessorProperty.java Sat Mar 09 21:49:32 2013 +0530 @@ -36,16 +36,16 @@ import static jdk.nashorn.internal.codegen.ObjectClassGenerator.getAccessorType; import static jdk.nashorn.internal.codegen.ObjectClassGenerator.getAccessorTypeIndex; import static jdk.nashorn.internal.codegen.ObjectClassGenerator.getNumberOfAccessorTypes; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; -import static jdk.nashorn.internal.runtime.linker.MethodHandleFactory.stripName; +import static jdk.nashorn.internal.lookup.Lookup.MH; +import static jdk.nashorn.internal.lookup.MethodHandleFactory.stripName; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; import jdk.nashorn.internal.codegen.ObjectClassGenerator; import jdk.nashorn.internal.codegen.types.Type; -import jdk.nashorn.internal.runtime.linker.Lookup; -import jdk.nashorn.internal.runtime.linker.MethodHandleFactory; +import jdk.nashorn.internal.lookup.Lookup; +import jdk.nashorn.internal.lookup.MethodHandleFactory; /**

--- a/src/jdk/nashorn/internal/runtime/Context.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/Context.java Sat Mar 09 21:49:32 2013 +0530 @@ -29,7 +29,7 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.STRICT_MODE; import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.io.File; import java.io.IOException;

--- a/src/jdk/nashorn/internal/runtime/FindProperty.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/FindProperty.java Sat Mar 09 21:49:32 2013 +0530 @@ -25,7 +25,7 @@ package jdk.nashorn.internal.runtime; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import jdk.nashorn.internal.codegen.ObjectClassGenerator;

--- a/src/jdk/nashorn/internal/runtime/GlobalFunctions.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/GlobalFunctions.java Sat Mar 09 21:49:32 2013 +0530 @@ -26,7 +26,7 @@ package jdk.nashorn.internal.runtime; import static jdk.nashorn.internal.runtime.JSType.digit; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles;

--- a/src/jdk/nashorn/internal/runtime/ScriptFunction.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/ScriptFunction.java Sat Mar 09 21:49:32 2013 +0530 @@ -28,7 +28,7 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup; import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -38,7 +38,7 @@ import jdk.internal.dynalink.linker.LinkRequest; import jdk.nashorn.internal.codegen.CompilerConstants.Call; import jdk.nashorn.internal.objects.annotations.SpecializedFunction; -import jdk.nashorn.internal.runtime.linker.MethodHandleFactory; +import jdk.nashorn.internal.lookup.MethodHandleFactory; import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor; import jdk.nashorn.internal.runtime.linker.NashornGuards;

--- a/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java Sat Mar 09 21:49:32 2013 +0530 @@ -27,7 +27,7 @@ import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles;

--- a/src/jdk/nashorn/internal/runtime/ScriptObject.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/ScriptObject.java Sat Mar 09 21:49:32 2013 +0530 @@ -39,7 +39,7 @@ import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndexNoThrow; import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.isValidArrayIndex; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -65,8 +65,8 @@ import jdk.nashorn.internal.objects.DataPropertyDescriptor; import jdk.nashorn.internal.runtime.arrays.ArrayData; import jdk.nashorn.internal.runtime.linker.Bootstrap; -import jdk.nashorn.internal.runtime.linker.Lookup; -import jdk.nashorn.internal.runtime.linker.MethodHandleFactory; +import jdk.nashorn.internal.lookup.Lookup; +import jdk.nashorn.internal.lookup.MethodHandleFactory; import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor; import jdk.nashorn.internal.runtime.linker.NashornGuards;

--- a/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java Sat Mar 09 21:49:32 2013 +0530 @@ -27,7 +27,7 @@ import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.io.BufferedReader; import java.io.File;

--- a/src/jdk/nashorn/internal/runtime/SetMethodCreator.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/SetMethodCreator.java Sat Mar 09 21:49:32 2013 +0530 @@ -26,13 +26,13 @@ package jdk.nashorn.internal.runtime; import static jdk.nashorn.internal.runtime.ECMAErrors.referenceError; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import jdk.internal.dynalink.CallSiteDescriptor; import jdk.internal.dynalink.linker.GuardedInvocation; import jdk.nashorn.internal.codegen.ObjectClassGenerator; -import jdk.nashorn.internal.runtime.linker.Lookup; +import jdk.nashorn.internal.lookup.Lookup; import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor; import jdk.nashorn.internal.runtime.linker.NashornGuards;

--- a/src/jdk/nashorn/internal/runtime/SpillProperty.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/SpillProperty.java Sat Mar 09 21:49:32 2013 +0530 @@ -25,11 +25,11 @@ package jdk.nashorn.internal.runtime; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; -import jdk.nashorn.internal.runtime.linker.Lookup; +import jdk.nashorn.internal.lookup.Lookup; /**

--- a/src/jdk/nashorn/internal/runtime/Undefined.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/Undefined.java Sat Mar 09 21:49:32 2013 +0530 @@ -26,7 +26,7 @@ package jdk.nashorn.internal.runtime; import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles;

--- a/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java Sat Mar 09 21:49:32 2013 +0530 @@ -26,7 +26,7 @@ package jdk.nashorn.internal.runtime; import java.lang.invoke.MethodHandle; -import jdk.nashorn.internal.runtime.linker.Lookup; +import jdk.nashorn.internal.lookup.Lookup; /**

--- a/src/jdk/nashorn/internal/runtime/WithObject.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/WithObject.java Sat Mar 09 21:49:32 2013 +0530 @@ -25,7 +25,7 @@ package jdk.nashorn.internal.runtime; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles;

--- a/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java Sat Mar 09 21:49:32 2013 +0530 @@ -25,6 +25,8 @@ package jdk.nashorn.internal.runtime.linker; +import jdk.nashorn.internal.lookup.MethodHandleFunctionality; +import jdk.nashorn.internal.lookup.MethodHandleFactory; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -42,7 +44,7 @@

--- a/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java Sat Mar 09 21:49:32 2013 +0530 @@ -41,7 +41,7 @@ import static jdk.internal.org.objectweb.asm.Opcodes.ISTORE; import static jdk.internal.org.objectweb.asm.Opcodes.RETURN; import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodType;

--- a/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java Sat Mar 09 21:49:32 2013 +0530 @@ -27,7 +27,7 @@ import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles;

--- a/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java Sat Mar 09 21:49:32 2013 +0530 @@ -25,7 +25,8 @@ package jdk.nashorn.internal.runtime.linker; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import jdk.nashorn.internal.lookup.MethodHandleFactory; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.io.FileNotFoundException; import java.io.FileOutputStream;

--- a/src/jdk/nashorn/internal/runtime/linker/Lookup.java Wed Mar 06 22:38:18 2013 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,212 +0,0 @@ -/*

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

- -}

--- a/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java Wed Mar 06 22:38:18 2013 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,646 +0,0 @@ -/*

-

-

-

-

-

-

-

-

-

- -

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

- -

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

- -

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-}

--- a/src/jdk/nashorn/internal/runtime/linker/MethodHandleFunctionality.java Wed Mar 06 22:38:18 2013 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,317 +0,0 @@ -/*

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-} -

--- a/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java Sat Mar 09 21:49:32 2013 +0530 @@ -27,7 +27,7 @@ import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import jdk.internal.dynalink.CallSiteDescriptor; @@ -46,7 +46,7 @@

--- a/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java Sat Mar 09 21:49:32 2013 +0530 @@ -25,7 +25,7 @@ package jdk.nashorn.internal.runtime.linker; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles;

--- a/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java Sat Mar 09 21:49:32 2013 +0530 @@ -25,7 +25,7 @@ package jdk.nashorn.internal.runtime.linker; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -47,7 +47,7 @@

--- a/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java Sat Mar 09 21:49:32 2013 +0530 @@ -25,7 +25,7 @@ package jdk.nashorn.internal.runtime.linker; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -45,7 +45,7 @@

--- a/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java Sat Mar 09 21:49:32 2013 +0530 @@ -48,7 +48,7 @@

--- a/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java Wed Mar 06 22:38:18 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java Sat Mar 09 21:49:32 2013 +0530 @@ -25,7 +25,8 @@ package jdk.nashorn.internal.runtime.linker; -import static jdk.nashorn.internal.runtime.linker.Lookup.MH; +import jdk.nashorn.internal.lookup.Lookup; +import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodType;

--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/currently-failing/JDK-8006529.js Sat Mar 09 21:49:32 2013 +0530 @@ -0,0 +1,210 @@ +/*

+})(); + +// returns "script" functionNode from Compiler instance +function getScriptNode(compiler) {

+} + +// returns functionNode.getFunctions().get(0) +function getFirstFunction(functionNode) {

+} + +// compile(script) -- compiles a script specified as a string with its +// source code, returns a jdk.nashorn.internal.ir.FunctionNode object +// representing it. +function compile(source) {

+

+

+}; + +var allAssertions = (function() {

+})(); + + +// test(f[, assertions...]) tests whether all the specified assertions on the +// passed function node are true. +function test(f) {

+} + +// testFirstFn(script[, assertions...] tests whether all the specified +// assertions are true in the first function in the given script; "script" +// is a string with the source text of the script. +function testFirstFn(script) {

+} + +// ---------------------------------- ACTUAL TESTS START HERE -------------- + +// The simplest possible functions have no attributes set +testFirstFn("function f() { }") +testFirstFn("function f(x) { x }") + +// A function referencing a global needs parent scope, and it needs callee +// (because parent scope is passed through callee) +testFirstFn("function f() { x }", 'needsCallee', 'needsParentScope') + +// A function referencing "arguments" will have to be vararg. It also needs +// the callee, as it needs to fill out "arguments.callee". +testFirstFn("function f() { arguments }", 'needsCallee', 'isVarArg') + +// A function referencing "arguments" will have to be vararg. If it is +// strict, it will not have to have a callee, though. +testFirstFn("function f() {'use strict'; arguments }", 'isVarArg', 'isStrictMode') + +// A function defining "arguments" as a parameter will not be vararg. +testFirstFn("function f(arguments) { arguments }") + +// A function defining "arguments" as a nested function will not be vararg. +testFirstFn("function f() { function arguments() {}; arguments; }") + +// A function defining "arguments" as a local variable will be vararg. +testFirstFn("function f() { var arguments; arguments; }", 'isVarArg', 'needsCallee') + +// A self-referencing function defined as a statement doesn't need a self +// symbol, as it'll rather obtain itself from the parent scope. +testFirstFn("function f() { f() }", 'needsCallee', 'needsParentScope') + +// A self-referencing function defined as an expression needs a self symbol, +// as it can't obtain itself from the parent scope. +testFirstFn("(function f() { f() })", 'needsCallee', 'needsSelfSymbol') + +// A child function accessing parent's variable triggers the need for scope +// in parent +testFirstFn("(function f() { var x; function g() { x } })", 'needsScope') + +// A child function accessing parent's parameter triggers the need for scope +// in parent +testFirstFn("(function f(x) { function g() { x } })", 'needsScope') + +// A child function accessing a global variable triggers the need for parent +// scope in parent +testFirstFn("(function f() { function g() { x } })", 'needsParentScope', 'needsCallee') + +// A child function redefining a local variable from its parent should not +// affect the parent function in any way +testFirstFn("(function f() { var x; function g() { var x; x } })") + +// Using "with" unleashes a lot of needs: parent scope, callee, own scope, +// and all variables in scope. Actually, we could make "with" less wasteful, +// and only put those variables in scope that it actually references, similar +// to what nested functions do with variables in their parents. +testFirstFn("(function f() { var o; with(o) {} })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasWith', 'hasDeepWithOrEval', 'allVarsInScope') + +// Using "eval" is as bad as using "with" with the added requirement of +// being vararg, 'cause we don't know if eval will be using "arguments". +testFirstFn("(function f() { eval() })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasEval', 'isVarArg', 'hasDeepWithOrEval', 'allVarsInScope') + +// Nested function using "with" is pretty much the same as the parent +// function needing with. +testFirstFn("(function f() { function g() { var o; with(o) {} } })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasDeepWithOrEval', 'allVarsInScope') +// Nested function using "eval" is almost the same as parent function using +// eval, but at least the parent doesn't have to be vararg. +testFirstFn("(function f() { function g() { eval() } })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasDeepWithOrEval', 'allVarsInScope') + +// Function with 250 named parameters is ordinary +testFirstFn("function f(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, p21, p22, p23, p24, p25, p26, p27, p28, p29, p30, p31, p32, p33, p34, p35, p36, p37, p38, p39, p40, p41, p42, p43, p44, p45, p46, p47, p48, p49, p50, p51, p52, p53, p54, p55, p56, p57, p58, p59, p60, p61, p62, p63, p64, p65, p66, p67, p68, p69, p70, p71, p72, p73, p74, p75, p76, p77, p78, p79, p80, p81, p82, p83, p84, p85, p86, p87, p88, p89, p90, p91, p92, p93, p94, p95, p96, p97, p98, p99, p100, p101, p102, p103, p104, p105, p106, p107, p108, p109, p110, p111, p112, p113, p114, p115, p116, p117, p118, p119, p120, p121, p122, p123, p124, p125, p126, p127, p128, p129, p130, p131, p132, p133, p134, p135, p136, p137, p138, p139, p140, p141, p142, p143, p144, p145, p146, p147, p148, p149, p150, p151, p152, p153, p154, p155, p156, p157, p158, p159, p160, p161, p162, p163, p164, p165, p166, p167, p168, p169, p170, p171, p172, p173, p174, p175, p176, p177, p178, p179, p180, p181, p182, p183, p184, p185, p186, p187, p188, p189, p190, p191, p192, p193, p194, p195, p196, p197, p198, p199, p200, p201, p202, p203, p204, p205, p206, p207, p208, p209, p210, p211, p212, p213, p214, p215, p216, p217, p218, p219, p220, p221, p222, p223, p224, p225, p226, p227, p228, p229, p230, p231, p232, p233, p234, p235, p236, p237, p238, p239, p240, p241, p242, p243, p244, p245, p246, p247, p248, p249, p250) { p250 = p249 }") + +// Function with 251 named parameters is variable arguments +testFirstFn("function f(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, p21, p22, p23, p24, p25, p26, p27, p28, p29, p30, p31, p32, p33, p34, p35, p36, p37, p38, p39, p40, p41, p42, p43, p44, p45, p46, p47, p48, p49, p50, p51, p52, p53, p54, p55, p56, p57, p58, p59, p60, p61, p62, p63, p64, p65, p66, p67, p68, p69, p70, p71, p72, p73, p74, p75, p76, p77, p78, p79, p80, p81, p82, p83, p84, p85, p86, p87, p88, p89, p90, p91, p92, p93, p94, p95, p96, p97, p98, p99, p100, p101, p102, p103, p104, p105, p106, p107, p108, p109, p110, p111, p112, p113, p114, p115, p116, p117, p118, p119, p120, p121, p122, p123, p124, p125, p126, p127, p128, p129, p130, p131, p132, p133, p134, p135, p136, p137, p138, p139, p140, p141, p142, p143, p144, p145, p146, p147, p148, p149, p150, p151, p152, p153, p154, p155, p156, p157, p158, p159, p160, p161, p162, p163, p164, p165, p166, p167, p168, p169, p170, p171, p172, p173, p174, p175, p176, p177, p178, p179, p180, p181, p182, p183, p184, p185, p186, p187, p188, p189, p190, p191, p192, p193, p194, p195, p196, p197, p198, p199, p200, p201, p202, p203, p204, p205, p206, p207, p208, p209, p210, p211, p212, p213, p214, p215, p216, p217, p218, p219, p220, p221, p222, p223, p224, p225, p226, p227, p228, p229, p230, p231, p232, p233, p234, p235, p236, p237, p238, p239, p240, p241, p242, p243, p244, p245, p246, p247, p248, p249, p250, p251) { p250 = p251 }", 'isVarArg')

--- a/test/script/trusted/JDK-8006529.js Wed Mar 06 22:38:18 2013 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,210 +0,0 @@ -/*

-})(); - -// returns "script" functionNode from Compiler instance -function getScriptNode(compiler) {

-} - -// returns functionNode.getFunctions().get(0) -function getFirstFunction(functionNode) {

-} - -// compile(script) -- compiles a script specified as a string with its -// source code, returns a jdk.nashorn.internal.ir.FunctionNode object -// representing it. -function compile(source) {

-

-

-}; - -var allAssertions = (function() {

-})(); - - -// test(f[, assertions...]) tests whether all the specified assertions on the -// passed function node are true. -function test(f) {

-} - -// testFirstFn(script[, assertions...] tests whether all the specified -// assertions are true in the first function in the given script; "script" -// is a string with the source text of the script. -function testFirstFn(script) {

-} - -// ---------------------------------- ACTUAL TESTS START HERE -------------- - -// The simplest possible functions have no attributes set -testFirstFn("function f() { }") -testFirstFn("function f(x) { x }") - -// A function referencing a global needs parent scope, and it needs callee -// (because parent scope is passed through callee) -testFirstFn("function f() { x }", 'needsCallee', 'needsParentScope') - -// A function referencing "arguments" will have to be vararg. It also needs -// the callee, as it needs to fill out "arguments.callee". -testFirstFn("function f() { arguments }", 'needsCallee', 'isVarArg') - -// A function referencing "arguments" will have to be vararg. If it is -// strict, it will not have to have a callee, though. -testFirstFn("function f() {'use strict'; arguments }", 'isVarArg', 'isStrictMode') - -// A function defining "arguments" as a parameter will not be vararg. -testFirstFn("function f(arguments) { arguments }") - -// A function defining "arguments" as a nested function will not be vararg. -testFirstFn("function f() { function arguments() {}; arguments; }") - -// A function defining "arguments" as a local variable will be vararg. -testFirstFn("function f() { var arguments; arguments; }", 'isVarArg', 'needsCallee') - -// A self-referencing function defined as a statement doesn't need a self -// symbol, as it'll rather obtain itself from the parent scope. -testFirstFn("function f() { f() }", 'needsCallee', 'needsParentScope') - -// A self-referencing function defined as an expression needs a self symbol, -// as it can't obtain itself from the parent scope. -testFirstFn("(function f() { f() })", 'needsCallee', 'needsSelfSymbol') - -// A child function accessing parent's variable triggers the need for scope -// in parent -testFirstFn("(function f() { var x; function g() { x } })", 'needsScope') - -// A child function accessing parent's parameter triggers the need for scope -// in parent -testFirstFn("(function f(x) { function g() { x } })", 'needsScope') - -// A child function accessing a global variable triggers the need for parent -// scope in parent -testFirstFn("(function f() { function g() { x } })", 'needsParentScope', 'needsCallee') - -// A child function redefining a local variable from its parent should not -// affect the parent function in any way -testFirstFn("(function f() { var x; function g() { var x; x } })") - -// Using "with" unleashes a lot of needs: parent scope, callee, own scope, -// and all variables in scope. Actually, we could make "with" less wasteful, -// and only put those variables in scope that it actually references, similar -// to what nested functions do with variables in their parents. -testFirstFn("(function f() { var o; with(o) {} })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasWith', 'hasDeepWithOrEval', 'allVarsInScope') - -// Using "eval" is as bad as using "with" with the added requirement of -// being vararg, 'cause we don't know if eval will be using "arguments". -testFirstFn("(function f() { eval() })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasEval', 'isVarArg', 'hasDeepWithOrEval', 'allVarsInScope') - -// Nested function using "with" is pretty much the same as the parent -// function needing with. -testFirstFn("(function f() { function g() { var o; with(o) {} } })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasDeepWithOrEval', 'allVarsInScope') -// Nested function using "eval" is almost the same as parent function using -// eval, but at least the parent doesn't have to be vararg. -testFirstFn("(function f() { function g() { eval() } })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasDeepWithOrEval', 'allVarsInScope') - -// Function with 250 named parameters is ordinary -testFirstFn("function f(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, p21, p22, p23, p24, p25, p26, p27, p28, p29, p30, p31, p32, p33, p34, p35, p36, p37, p38, p39, p40, p41, p42, p43, p44, p45, p46, p47, p48, p49, p50, p51, p52, p53, p54, p55, p56, p57, p58, p59, p60, p61, p62, p63, p64, p65, p66, p67, p68, p69, p70, p71, p72, p73, p74, p75, p76, p77, p78, p79, p80, p81, p82, p83, p84, p85, p86, p87, p88, p89, p90, p91, p92, p93, p94, p95, p96, p97, p98, p99, p100, p101, p102, p103, p104, p105, p106, p107, p108, p109, p110, p111, p112, p113, p114, p115, p116, p117, p118, p119, p120, p121, p122, p123, p124, p125, p126, p127, p128, p129, p130, p131, p132, p133, p134, p135, p136, p137, p138, p139, p140, p141, p142, p143, p144, p145, p146, p147, p148, p149, p150, p151, p152, p153, p154, p155, p156, p157, p158, p159, p160, p161, p162, p163, p164, p165, p166, p167, p168, p169, p170, p171, p172, p173, p174, p175, p176, p177, p178, p179, p180, p181, p182, p183, p184, p185, p186, p187, p188, p189, p190, p191, p192, p193, p194, p195, p196, p197, p198, p199, p200, p201, p202, p203, p204, p205, p206, p207, p208, p209, p210, p211, p212, p213, p214, p215, p216, p217, p218, p219, p220, p221, p222, p223, p224, p225, p226, p227, p228, p229, p230, p231, p232, p233, p234, p235, p236, p237, p238, p239, p240, p241, p242, p243, p244, p245, p246, p247, p248, p249, p250) { p250 = p249 }") - -// Function with 251 named parameters is variable arguments -testFirstFn("function f(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, p21, p22, p23, p24, p25, p26, p27, p28, p29, p30, p31, p32, p33, p34, p35, p36, p37, p38, p39, p40, p41, p42, p43, p44, p45, p46, p47, p48, p49, p50, p51, p52, p53, p54, p55, p56, p57, p58, p59, p60, p61, p62, p63, p64, p65, p66, p67, p68, p69, p70, p71, p72, p73, p74, p75, p76, p77, p78, p79, p80, p81, p82, p83, p84, p85, p86, p87, p88, p89, p90, p91, p92, p93, p94, p95, p96, p97, p98, p99, p100, p101, p102, p103, p104, p105, p106, p107, p108, p109, p110, p111, p112, p113, p114, p115, p116, p117, p118, p119, p120, p121, p122, p123, p124, p125, p126, p127, p128, p129, p130, p131, p132, p133, p134, p135, p136, p137, p138, p139, p140, p141, p142, p143, p144, p145, p146, p147, p148, p149, p150, p151, p152, p153, p154, p155, p156, p157, p158, p159, p160, p161, p162, p163, p164, p165, p166, p167, p168, p169, p170, p171, p172, p173, p174, p175, p176, p177, p178, p179, p180, p181, p182, p183, p184, p185, p186, p187, p188, p189, p190, p191, p192, p193, p194, p195, p196, p197, p198, p199, p200, p201, p202, p203, p204, p205, p206, p207, p208, p209, p210, p211, p212, p213, p214, p215, p216, p217, p218, p219, p220, p221, p222, p223, p224, p225, p226, p227, p228, p229, p230, p231, p232, p233, p234, p235, p236, p237, p238, p239, p240, p241, p242, p243, p244, p245, p246, p247, p248, p249, p250, p251) { p250 = p251 }", 'isVarArg')