Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/README	Wed Mar 26 12:01:34 2014 -0700
     1.2 +++ b/README	Tue Apr 01 11:44:05 2014 -0700
     1.3 @@ -81,13 +81,13 @@
     1.4      
     1.5  After that, you can run the tests using:
     1.6      cd make
     1.7 -    ant test
     1.8 +    ant clean test
     1.9      
    1.10  You can also run the ECMA-262 test suite with Nashorn. In order to do
    1.11  that, you will need to get a copy of it and put it in
    1.12  test/script/external/test262 directory. A convenient way to do it is:
    1.13  
    1.14 -   hg clone http://hg.ecmascript.org/tests/test262/ test/script/external/test262
    1.15 +   git clone https://github.com/tc39/test262 test/script/external/test262
    1.16      
    1.17  Alternatively, you can check it out elsewhere and make
    1.18  test/script/external/test262 a symbolic link to that directory. After
    1.19 @@ -95,6 +95,11 @@
    1.20  
    1.21      cd nashorn~jdk8/nashorn/make
    1.22      ant test262
    1.23 +
    1.24 +Ant target to get/update external test suites:
    1.25 +
    1.26 +    ant externals
    1.27 +    ant update-externals
    1.28      
    1.29  These tests take time, so we have a parallelized runner for them that
    1.30  takes advantage of all processor cores on the computer:

     2.1 --- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java	Wed Mar 26 12:01:34 2014 -0700
     2.2 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java	Tue Apr 01 11:44:05 2014 -0700
     2.3 @@ -50,8 +50,6 @@
     2.4  import static jdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTIONS_EMPTY_LIST;
     2.5  import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_DESC;
     2.6  import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_FIELD_NAME;
     2.7 -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_SETISSHARED;
     2.8 -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_SETISSHARED_DESC;
     2.9  import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_NEWMAP;
    2.10  import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_NEWMAP_DESC;
    2.11  import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_TYPE;
    2.12 @@ -191,8 +189,6 @@
    2.13          // stack: Collection
    2.14          // pmap = PropertyMap.newMap(Collection<Property>);
    2.15          mi.invokeStatic(PROPERTYMAP_TYPE, PROPERTYMAP_NEWMAP, PROPERTYMAP_NEWMAP_DESC);
    2.16 -        // pmap.setIsShared();
    2.17 -        mi.invokeVirtual(PROPERTYMAP_TYPE, PROPERTYMAP_SETISSHARED, PROPERTYMAP_SETISSHARED_DESC);
    2.18          // $nasgenmap$ = pmap;
    2.19          mi.putStatic(className, PROPERTYMAP_FIELD_NAME, PROPERTYMAP_DESC);
    2.20          mi.returnVoid();

     3.1 --- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java	Wed Mar 26 12:01:34 2014 -0700
     3.2 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java	Tue Apr 01 11:44:05 2014 -0700
     3.3 @@ -33,10 +33,7 @@
     3.4  import static jdk.nashorn.internal.tools.nasgen.StringConstants.DEFAULT_INIT_DESC;
     3.5  import static jdk.nashorn.internal.tools.nasgen.StringConstants.INIT;
     3.6  import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_DESC;
     3.7 -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_DUPLICATE;
     3.8 -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_DUPLICATE_DESC;
     3.9  import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_FIELD_NAME;
    3.10 -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_TYPE;
    3.11  import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC;
    3.12  import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_SETCONSTRUCTOR;
    3.13  import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_SETCONSTRUCTOR_DESC;
    3.14 @@ -171,9 +168,6 @@
    3.15      private void loadMap(final MethodGenerator mi) {
    3.16          if (memberCount > 0) {
    3.17              mi.getStatic(className, PROPERTYMAP_FIELD_NAME, PROPERTYMAP_DESC);
    3.18 -            // make sure we use duplicated PropertyMap so that original map
    3.19 -            // stays intact and so can be used for many globals.
    3.20 -            mi.invokeVirtual(PROPERTYMAP_TYPE, PROPERTYMAP_DUPLICATE, PROPERTYMAP_DUPLICATE_DESC);
    3.21          }
    3.22      }
    3.23  

     4.1 --- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java	Wed Mar 26 12:01:34 2014 -0700
     4.2 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java	Tue Apr 01 11:44:05 2014 -0700
     4.3 @@ -22,40 +22,62 @@
     4.4   * or visit www.oracle.com if you need additional information or have any
     4.5   * questions.
     4.6   */
     4.7 -
     4.8  package jdk.nashorn.internal.tools.nasgen;
     4.9  
    4.10  import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_ARRAY_DESC;
    4.11  import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC;
    4.12 +import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTOBJECT_DESC;
    4.13 +import static jdk.nashorn.internal.tools.nasgen.StringConstants.STRING_DESC;
    4.14  
    4.15  import jdk.internal.org.objectweb.asm.Opcodes;
    4.16  import jdk.internal.org.objectweb.asm.Type;
    4.17  import jdk.nashorn.internal.objects.annotations.Where;
    4.18 +import jdk.nashorn.internal.runtime.ScriptObject;
    4.19  
    4.20  /**
    4.21   * Details about a Java method or field annotated with any of the field/method
    4.22   * annotations from the jdk.nashorn.internal.objects.annotations package.
    4.23   */
    4.24  public final class MemberInfo implements Cloneable {
    4.25 +    // class loader of this class
    4.26 +    private static ClassLoader myLoader = MemberInfo.class.getClassLoader();
    4.27 +
    4.28      /**
    4.29       * The different kinds of available class annotations
    4.30       */
    4.31      public static enum Kind {
    4.32 -        /** This is a script class */
    4.33 +
    4.34 +        /**
    4.35 +         * This is a script class
    4.36 +         */
    4.37          SCRIPT_CLASS,
    4.38 -        /** This is a constructor */
    4.39 +        /**
    4.40 +         * This is a constructor
    4.41 +         */
    4.42          CONSTRUCTOR,
    4.43 -        /** This is a function */
    4.44 +        /**
    4.45 +         * This is a function
    4.46 +         */
    4.47          FUNCTION,
    4.48 -        /** This is a getter */
    4.49 +        /**
    4.50 +         * This is a getter
    4.51 +         */
    4.52          GETTER,
    4.53 -        /** This is a setter */
    4.54 +        /**
    4.55 +         * This is a setter
    4.56 +         */
    4.57          SETTER,
    4.58 -        /** This is a property */
    4.59 +        /**
    4.60 +         * This is a property
    4.61 +         */
    4.62          PROPERTY,
    4.63 -        /** This is a specialized version of a function */
    4.64 +        /**
    4.65 +         * This is a specialized version of a function
    4.66 +         */
    4.67          SPECIALIZED_FUNCTION,
    4.68 -        /** This is a specialized version of a constructor */
    4.69 +        /**
    4.70 +         * This is a specialized version of a constructor
    4.71 +         */
    4.72          SPECIALIZED_CONSTRUCTOR
    4.73      }
    4.74  
    4.75 @@ -194,6 +216,7 @@
    4.76  
    4.77      /**
    4.78       * Check whether this MemberInfo is a getter that resides in the instance
    4.79 +     *
    4.80       * @return true if instance setter
    4.81       */
    4.82      boolean isInstanceSetter() {
    4.83 @@ -245,96 +268,201 @@
    4.84      }
    4.85  
    4.86      void verify() {
    4.87 -        if (kind == Kind.CONSTRUCTOR) {
    4.88 -            final Type returnType = Type.getReturnType(javaDesc);
    4.89 -            if (! returnType.toString().equals(OBJECT_DESC)) {
    4.90 -                error("return value should be of Object type, found" + returnType);
    4.91 -            }
    4.92 -            final Type[] argTypes = Type.getArgumentTypes(javaDesc);
    4.93 -            if (argTypes.length < 2) {
    4.94 -                error("constructor methods should have at least 2 args");
    4.95 -            }
    4.96 -            if (! argTypes[0].equals(Type.BOOLEAN_TYPE)) {
    4.97 -                error("first argument should be of boolean type, found" + argTypes[0]);
    4.98 -            }
    4.99 -            if (! argTypes[1].toString().equals(OBJECT_DESC)) {
   4.100 -                error("second argument should be of Object type, found" + argTypes[0]);
   4.101 -            }
   4.102 +        switch (kind) {
   4.103 +            case CONSTRUCTOR: {
   4.104 +                final Type returnType = Type.getReturnType(javaDesc);
   4.105 +                if (!isJSObjectType(returnType)) {
   4.106 +                    error("return value of a @Constructor method should be of Object type, found " + returnType);
   4.107 +                }
   4.108 +                final Type[] argTypes = Type.getArgumentTypes(javaDesc);
   4.109 +                if (argTypes.length < 2) {
   4.110 +                    error("@Constructor methods should have at least 2 args");
   4.111 +                }
   4.112 +                if (!argTypes[0].equals(Type.BOOLEAN_TYPE)) {
   4.113 +                    error("first argument of a @Constructor method should be of boolean type, found " + argTypes[0]);
   4.114 +                }
   4.115 +                if (!isJavaLangObject(argTypes[1])) {
   4.116 +                    error("second argument of a @Constructor method should be of Object type, found " + argTypes[0]);
   4.117 +                }
   4.118  
   4.119 -            if (argTypes.length > 2) {
   4.120 -                for (int i = 2; i < argTypes.length - 1; i++) {
   4.121 -                    if (! argTypes[i].toString().equals(OBJECT_DESC)) {
   4.122 -                        error(i + "'th argument should be of Object type, found " + argTypes[i]);
   4.123 +                if (argTypes.length > 2) {
   4.124 +                    for (int i = 2; i < argTypes.length - 1; i++) {
   4.125 +                        if (!isJavaLangObject(argTypes[i])) {
   4.126 +                            error(i + "'th argument of a @Constructor method should be of Object type, found " + argTypes[i]);
   4.127 +                        }
   4.128 +                    }
   4.129 +
   4.130 +                    final String lastArgTypeDesc = argTypes[argTypes.length - 1].getDescriptor();
   4.131 +                    final boolean isVarArg = lastArgTypeDesc.equals(OBJECT_ARRAY_DESC);
   4.132 +                    if (!lastArgTypeDesc.equals(OBJECT_DESC) && !isVarArg) {
   4.133 +                        error("last argument of a @Constructor method is neither Object nor Object[] type: " + lastArgTypeDesc);
   4.134 +                    }
   4.135 +
   4.136 +                    if (isVarArg && argTypes.length > 3) {
   4.137 +                        error("vararg of a @Constructor method has more than 3 arguments");
   4.138                      }
   4.139                  }
   4.140 -
   4.141 -                final String lastArgType = argTypes[argTypes.length - 1].toString();
   4.142 -                final boolean isVarArg = lastArgType.equals(OBJECT_ARRAY_DESC);
   4.143 -                if (!lastArgType.equals(OBJECT_DESC) && !isVarArg) {
   4.144 -                    error("last argument is neither Object nor Object[] type: " + lastArgType);
   4.145 +            }
   4.146 +            break;
   4.147 +            case SPECIALIZED_CONSTRUCTOR: {
   4.148 +                final Type returnType = Type.getReturnType(javaDesc);
   4.149 +                if (!isJSObjectType(returnType)) {
   4.150 +                    error("return value of a @SpecializedConstructor method should be a valid JS type, found " + returnType);
   4.151 +                }
   4.152 +                final Type[] argTypes = Type.getArgumentTypes(javaDesc);
   4.153 +                for (int i = 0; i < argTypes.length; i++) {
   4.154 +                    if (!isValidJSType(argTypes[i])) {
   4.155 +                        error(i + "'th argument of a @SpecializedConstructor method is not valid JS type, found " + argTypes[i]);
   4.156 +                    }
   4.157 +                }
   4.158 +            }
   4.159 +            break;
   4.160 +            case FUNCTION: {
   4.161 +                final Type returnType = Type.getReturnType(javaDesc);
   4.162 +                if (!isValidJSType(returnType)) {
   4.163 +                    error("return value of a @Function method should be a valid JS type, found " + returnType);
   4.164 +                }
   4.165 +                final Type[] argTypes = Type.getArgumentTypes(javaDesc);
   4.166 +                if (argTypes.length < 1) {
   4.167 +                    error("@Function methods should have at least 1 arg");
   4.168 +                }
   4.169 +                if (!isJavaLangObject(argTypes[0])) {
   4.170 +                    error("first argument of a @Function method should be of Object type, found " + argTypes[0]);
   4.171                  }
   4.172  
   4.173 -                if (isVarArg && argTypes.length > 3) {
   4.174 -                    error("vararg constructor has more than 3 arguments");
   4.175 +                if (argTypes.length > 1) {
   4.176 +                    for (int i = 1; i < argTypes.length - 1; i++) {
   4.177 +                        if (!isJavaLangObject(argTypes[i])) {
   4.178 +                            error(i + "'th argument of a @Function method should be of Object type, found " + argTypes[i]);
   4.179 +                        }
   4.180 +                    }
   4.181 +
   4.182 +                    final String lastArgTypeDesc = argTypes[argTypes.length - 1].getDescriptor();
   4.183 +                    final boolean isVarArg = lastArgTypeDesc.equals(OBJECT_ARRAY_DESC);
   4.184 +                    if (!lastArgTypeDesc.equals(OBJECT_DESC) && !isVarArg) {
   4.185 +                        error("last argument of a @Function method is neither Object nor Object[] type: " + lastArgTypeDesc);
   4.186 +                    }
   4.187 +
   4.188 +                    if (isVarArg && argTypes.length > 2) {
   4.189 +                        error("vararg @Function method has more than 2 arguments");
   4.190 +                    }
   4.191                  }
   4.192              }
   4.193 -        } else if (kind == Kind.FUNCTION) {
   4.194 -            final Type returnType = Type.getReturnType(javaDesc);
   4.195 -            if (! returnType.toString().equals(OBJECT_DESC)) {
   4.196 -                error("return value should be of Object type, found" + returnType);
   4.197 -            }
   4.198 -            final Type[] argTypes = Type.getArgumentTypes(javaDesc);
   4.199 -            if (argTypes.length < 1) {
   4.200 -                error("function methods should have at least 1 arg");
   4.201 -            }
   4.202 -            if (! argTypes[0].toString().equals(OBJECT_DESC)) {
   4.203 -                error("first argument should be of Object type, found" + argTypes[0]);
   4.204 -            }
   4.205 -
   4.206 -            if (argTypes.length > 1) {
   4.207 -                for (int i = 1; i < argTypes.length - 1; i++) {
   4.208 -                    if (! argTypes[i].toString().equals(OBJECT_DESC)) {
   4.209 -                        error(i + "'th argument should be of Object type, found " + argTypes[i]);
   4.210 +            break;
   4.211 +            case SPECIALIZED_FUNCTION: {
   4.212 +                final Type returnType = Type.getReturnType(javaDesc);
   4.213 +                if (!isValidJSType(returnType)) {
   4.214 +                    error("return value of a @SpecializedFunction method should be a valid JS type, found " + returnType);
   4.215 +                }
   4.216 +                final Type[] argTypes = Type.getArgumentTypes(javaDesc);
   4.217 +                for (int i = 0; i < argTypes.length; i++) {
   4.218 +                    if (!isValidJSType(argTypes[i])) {
   4.219 +                        error(i + "'th argument of a @SpecializedFunction method is not valid JS type, found " + argTypes[i]);
   4.220                      }
   4.221                  }
   4.222 -
   4.223 -                final String lastArgType = argTypes[argTypes.length - 1].toString();
   4.224 -                final boolean isVarArg = lastArgType.equals(OBJECT_ARRAY_DESC);
   4.225 -                if (!lastArgType.equals(OBJECT_DESC) && !isVarArg) {
   4.226 -                    error("last argument is neither Object nor Object[] type: " + lastArgType);
   4.227 +            }
   4.228 +            break;
   4.229 +            case GETTER: {
   4.230 +                final Type[] argTypes = Type.getArgumentTypes(javaDesc);
   4.231 +                if (argTypes.length != 1) {
   4.232 +                    error("@Getter methods should have one argument");
   4.233 +                }
   4.234 +                if (!isJavaLangObject(argTypes[0])) {
   4.235 +                    error("first argument of a @Getter method should be of Object type, found: " + argTypes[0]);
   4.236                  }
   4.237  
   4.238 -                if (isVarArg && argTypes.length > 2) {
   4.239 -                    error("vararg function has more than 2 arguments");
   4.240 +                final Type returnType = Type.getReturnType(javaDesc);
   4.241 +                if (!isJavaLangObject(returnType)) {
   4.242 +                    error("return type of a @Getter method should be Object, found: " + javaDesc);
   4.243                  }
   4.244              }
   4.245 -        } else if (kind == Kind.GETTER) {
   4.246 -            final Type[] argTypes = Type.getArgumentTypes(javaDesc);
   4.247 -            if (argTypes.length != 1) {
   4.248 -                error("getter methods should have one argument");
   4.249 +            break;
   4.250 +            case SETTER: {
   4.251 +                final Type[] argTypes = Type.getArgumentTypes(javaDesc);
   4.252 +                if (argTypes.length != 2) {
   4.253 +                    error("@Setter methods should have two arguments");
   4.254 +                }
   4.255 +                if (!isJavaLangObject(argTypes[0])) {
   4.256 +                    error("first argument of a @Setter method should be of Object type, found: " + argTypes[0]);
   4.257 +                }
   4.258 +                if (!Type.getReturnType(javaDesc).toString().equals("V")) {
   4.259 +                    error("return type of of a @Setter method should be void, found: " + Type.getReturnType(javaDesc));
   4.260 +                }
   4.261              }
   4.262 -            if (! argTypes[0].toString().equals(OBJECT_DESC)) {
   4.263 -                error("first argument of getter should be of Object type, found: " + argTypes[0]);
   4.264 -            }
   4.265 -            if (Type.getReturnType(javaDesc).equals(Type.VOID_TYPE)) {
   4.266 -                error("return type of getter should not be void");
   4.267 -            }
   4.268 -        } else if (kind == Kind.SETTER) {
   4.269 -            final Type[] argTypes = Type.getArgumentTypes(javaDesc);
   4.270 -            if (argTypes.length != 2) {
   4.271 -                error("setter methods should have two arguments");
   4.272 -            }
   4.273 -            if (! argTypes[0].toString().equals(OBJECT_DESC)) {
   4.274 -                error("first argument of setter should be of Object type, found: " + argTypes[0]);
   4.275 -            }
   4.276 -            if (!Type.getReturnType(javaDesc).toString().equals("V")) {
   4.277 -                error("return type of setter should be void, found: " + Type.getReturnType(javaDesc));
   4.278 +            break;
   4.279 +            case PROPERTY: {
   4.280 +                if (where == Where.CONSTRUCTOR) {
   4.281 +                    if (isStatic()) {
   4.282 +                        if (!isFinal()) {
   4.283 +                            error("static Where.CONSTRUCTOR @Property should be final");
   4.284 +                        }
   4.285 +
   4.286 +                        if (!isJSPrimitiveType(Type.getType(javaDesc))) {
   4.287 +                            error("static Where.CONSTRUCTOR @Property should be a JS primitive");
   4.288 +                        }
   4.289 +                    }
   4.290 +                } else if (where == Where.PROTOTYPE) {
   4.291 +                    if (isStatic()) {
   4.292 +                        if (!isFinal()) {
   4.293 +                            error("static Where.PROTOTYPE @Property should be final");
   4.294 +                        }
   4.295 +
   4.296 +                        if (!isJSPrimitiveType(Type.getType(javaDesc))) {
   4.297 +                            error("static Where.PROTOTYPE @Property should be a JS primitive");
   4.298 +                        }
   4.299 +                    }
   4.300 +                }
   4.301              }
   4.302          }
   4.303      }
   4.304  
   4.305 +    private static boolean isValidJSType(final Type type) {
   4.306 +        return isJSPrimitiveType(type) || isJSObjectType(type);
   4.307 +    }
   4.308 +
   4.309 +    private static boolean isJSPrimitiveType(final Type type) {
   4.310 +        switch (type.getSort()) {
   4.311 +            case Type.BOOLEAN:
   4.312 +            case Type.INT:
   4.313 +            case Type.LONG:
   4.314 +            case Type.DOUBLE:
   4.315 +                return true;
   4.316 +            default:
   4.317 +                return false;
   4.318 +        }
   4.319 +    }
   4.320 +
   4.321 +    private static boolean isJSObjectType(final Type type) {
   4.322 +        return isJavaLangObject(type) || isJavaLangString(type) || isScriptObject(type);
   4.323 +    }
   4.324 +
   4.325 +    private static boolean isJavaLangObject(final Type type) {
   4.326 +        return type.getDescriptor().equals(OBJECT_DESC);
   4.327 +    }
   4.328 +
   4.329 +    private static boolean isJavaLangString(final Type type) {
   4.330 +        return type.getDescriptor().equals(STRING_DESC);
   4.331 +    }
   4.332 +
   4.333 +    private static boolean isScriptObject(final Type type) {
   4.334 +        if (type.getDescriptor().equals(SCRIPTOBJECT_DESC)) {
   4.335 +            return true;
   4.336 +        }
   4.337 +
   4.338 +        if (type.getSort() == Type.OBJECT) {
   4.339 +            try {
   4.340 +                final Class clazz = Class.forName(type.getClassName(), false, myLoader);
   4.341 +                return ScriptObject.class.isAssignableFrom(clazz);
   4.342 +            } catch (final ClassNotFoundException cnfe) {
   4.343 +                return false;
   4.344 +            }
   4.345 +        }
   4.346 +
   4.347 +        return false;
   4.348 +    }
   4.349 +
   4.350      private void error(final String msg) {
   4.351 -        throw new RuntimeException(javaName + javaDesc + " : " + msg);
   4.352 +        throw new RuntimeException(javaName + " of type " + javaDesc + " : " + msg);
   4.353      }
   4.354  
   4.355      /**

     5.1 --- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java	Wed Mar 26 12:01:34 2014 -0700
     5.2 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java	Tue Apr 01 11:44:05 2014 -0700
     5.3 @@ -349,19 +349,19 @@
     5.4  
     5.5      // invokes, field get/sets
     5.6      void invokeInterface(final String owner, final String method, final String desc) {
     5.7 -        super.visitMethodInsn(INVOKEINTERFACE, owner, method, desc);
     5.8 +        super.visitMethodInsn(INVOKEINTERFACE, owner, method, desc, true);
     5.9      }
    5.10  
    5.11      void invokeVirtual(final String owner, final String method, final String desc) {
    5.12 -        super.visitMethodInsn(INVOKEVIRTUAL, owner, method, desc);
    5.13 +        super.visitMethodInsn(INVOKEVIRTUAL, owner, method, desc, false);
    5.14      }
    5.15  
    5.16      void invokeSpecial(final String owner, final String method, final String desc) {
    5.17 -        super.visitMethodInsn(INVOKESPECIAL, owner, method, desc);
    5.18 +        super.visitMethodInsn(INVOKESPECIAL, owner, method, desc, false);
    5.19      }
    5.20  
    5.21      void invokeStatic(final String owner, final String method, final String desc) {
    5.22 -        super.visitMethodInsn(INVOKESTATIC, owner, method, desc);
    5.23 +        super.visitMethodInsn(INVOKESTATIC, owner, method, desc, false);
    5.24      }
    5.25  
    5.26      void putStatic(final String owner, final String field, final String desc) {
    5.27 @@ -413,7 +413,7 @@
    5.28          super.visitMethodInsn(INVOKEVIRTUAL,
    5.29                      "java/io/PrintStream",
    5.30                      "println",
    5.31 -                    "(Ljava/lang/String;)V");
    5.32 +                    "(Ljava/lang/String;)V", false);
    5.33      }
    5.34  
    5.35      // print the object on the top of the stack
    5.36 @@ -426,6 +426,6 @@
    5.37          super.visitMethodInsn(INVOKEVIRTUAL,
    5.38                      "java/io/PrintStream",
    5.39                      "println",
    5.40 -                    "(Ljava/lang/Object;)V");
    5.41 +                    "(Ljava/lang/Object;)V", false);
    5.42      }
    5.43  }

     6.1 --- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java	Wed Mar 26 12:01:34 2014 -0700
     6.2 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java	Tue Apr 01 11:44:05 2014 -0700
     6.3 @@ -32,10 +32,7 @@
     6.4  import static jdk.nashorn.internal.tools.nasgen.StringConstants.DEFAULT_INIT_DESC;
     6.5  import static jdk.nashorn.internal.tools.nasgen.StringConstants.INIT;
     6.6  import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_DESC;
     6.7 -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_DUPLICATE;
     6.8 -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_DUPLICATE_DESC;
     6.9  import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_FIELD_NAME;
    6.10 -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_TYPE;
    6.11  import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC;
    6.12  import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_TYPE;
    6.13  import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPE_SUFFIX;
    6.14 @@ -129,7 +126,6 @@
    6.15              mi.getStatic(className, PROPERTYMAP_FIELD_NAME, PROPERTYMAP_DESC);
    6.16              // make sure we use duplicated PropertyMap so that original map
    6.17              // stays intact and so can be used for many global.
    6.18 -            mi.invokeVirtual(PROPERTYMAP_TYPE, PROPERTYMAP_DUPLICATE, PROPERTYMAP_DUPLICATE_DESC);
    6.19              mi.invokeSpecial(PROTOTYPEOBJECT_TYPE, INIT, SCRIPTOBJECT_INIT_DESC);
    6.20              // initialize Function type fields
    6.21              initFunctionFields(mi);

     7.1 --- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java	Wed Mar 26 12:01:34 2014 -0700
     7.2 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java	Tue Apr 01 11:44:05 2014 -0700
     7.3 @@ -146,16 +146,16 @@
     7.4                  // call $clinit$ just before return from <clinit>
     7.5                  if (isStaticInit && opcode == RETURN) {
     7.6                      super.visitMethodInsn(INVOKESTATIC, scriptClassInfo.getJavaName(),
     7.7 -                            $CLINIT$, DEFAULT_INIT_DESC);
     7.8 +                            $CLINIT$, DEFAULT_INIT_DESC, false);
     7.9                  }
    7.10                  super.visitInsn(opcode);
    7.11              }
    7.12  
    7.13              @Override
    7.14 -            public void visitMethodInsn(final int opcode, final String owner, final String name, final String desc) {
    7.15 +            public void visitMethodInsn(final int opcode, final String owner, final String name, final String desc, final boolean itf) {
    7.16                  if (isConstructor && opcode == INVOKESPECIAL &&
    7.17                          INIT.equals(name) && SCRIPTOBJECT_TYPE.equals(owner)) {
    7.18 -                    super.visitMethodInsn(opcode, owner, name, desc);
    7.19 +                    super.visitMethodInsn(opcode, owner, name, desc, false);
    7.20  
    7.21                      if (memberCount > 0) {
    7.22                          // initialize @Property fields if needed
    7.23 @@ -166,7 +166,7 @@
    7.24                                  super.visitTypeInsn(NEW, clazz);
    7.25                                  super.visitInsn(DUP);
    7.26                                  super.visitMethodInsn(INVOKESPECIAL, clazz,
    7.27 -                                    INIT, DEFAULT_INIT_DESC);
    7.28 +                                    INIT, DEFAULT_INIT_DESC, false);
    7.29                                  super.visitFieldInsn(PUTFIELD, scriptClassInfo.getJavaName(),
    7.30                                      memInfo.getJavaName(), memInfo.getJavaDesc());
    7.31                              }
    7.32 @@ -180,7 +180,7 @@
    7.33                          }
    7.34                      }
    7.35                  } else {
    7.36 -                    super.visitMethodInsn(opcode, owner, name, desc);
    7.37 +                    super.visitMethodInsn(opcode, owner, name, desc, itf);
    7.38                  }
    7.39              }
    7.40  

     8.1 --- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java	Wed Mar 26 12:01:34 2014 -0700
     8.2 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java	Tue Apr 01 11:44:05 2014 -0700
     8.3 @@ -45,11 +45,9 @@
     8.4  @SuppressWarnings("javadoc")
     8.5  public interface StringConstants {
     8.6      // standard jdk types, methods
     8.7 -    static final Type TYPE_METHOD             = Type.getType(Method.class);
     8.8      static final Type TYPE_METHODHANDLE       = Type.getType(MethodHandle.class);
     8.9      static final Type TYPE_METHODHANDLE_ARRAY = Type.getType(MethodHandle[].class);
    8.10      static final Type TYPE_OBJECT             = Type.getType(Object.class);
    8.11 -    static final Type TYPE_CLASS              = Type.getType(Class.class);
    8.12      static final Type TYPE_STRING             = Type.getType(String.class);
    8.13      static final Type TYPE_COLLECTION         = Type.getType(Collection.class);
    8.14      static final Type TYPE_COLLECTIONS        = Type.getType(Collections.class);
    8.15 @@ -63,6 +61,8 @@
    8.16      static final String METHODHANDLE_TYPE = TYPE_METHODHANDLE.getInternalName();
    8.17      static final String OBJECT_TYPE = TYPE_OBJECT.getInternalName();
    8.18      static final String OBJECT_DESC = TYPE_OBJECT.getDescriptor();
    8.19 +    static final String STRING_TYPE = TYPE_STRING.getInternalName();
    8.20 +    static final String STRING_DESC = TYPE_STRING.getDescriptor();
    8.21      static final String OBJECT_ARRAY_DESC = Type.getDescriptor(Object[].class);
    8.22      static final String ARRAYLIST_TYPE = TYPE_ARRAYLIST.getInternalName();
    8.23      static final String COLLECTION_TYPE = TYPE_COLLECTION.getInternalName();
    8.24 @@ -104,10 +104,6 @@
    8.25      static final String PROPERTYMAP_DESC = TYPE_PROPERTYMAP.getDescriptor();
    8.26      static final String PROPERTYMAP_NEWMAP = "newMap";
    8.27      static final String PROPERTYMAP_NEWMAP_DESC = Type.getMethodDescriptor(TYPE_PROPERTYMAP, TYPE_COLLECTION);
    8.28 -    static final String PROPERTYMAP_DUPLICATE = "duplicate";
    8.29 -    static final String PROPERTYMAP_DUPLICATE_DESC = Type.getMethodDescriptor(TYPE_PROPERTYMAP);
    8.30 -    static final String PROPERTYMAP_SETISSHARED = "setIsShared";
    8.31 -    static final String PROPERTYMAP_SETISSHARED_DESC = Type.getMethodDescriptor(TYPE_PROPERTYMAP);
    8.32  
    8.33      // PrototypeObject
    8.34      static final String PROTOTYPEOBJECT_TYPE = TYPE_PROTOTYPEOBJECT.getInternalName();
    8.35 @@ -135,6 +131,7 @@
    8.36  
    8.37      // ScriptObject
    8.38      static final String SCRIPTOBJECT_TYPE = TYPE_SCRIPTOBJECT.getInternalName();
    8.39 +    static final String SCRIPTOBJECT_DESC = TYPE_SCRIPTOBJECT.getDescriptor();
    8.40      static final String SCRIPTOBJECT_INIT_DESC = Type.getMethodDescriptor(Type.VOID_TYPE, TYPE_PROPERTYMAP);
    8.41  
    8.42      static final String GETTER_PREFIX = "G$";

     9.1 --- a/make/BuildNashorn.gmk	Wed Mar 26 12:01:34 2014 -0700
     9.2 +++ b/make/BuildNashorn.gmk	Tue Apr 01 11:44:05 2014 -0700
     9.3 @@ -77,7 +77,7 @@
     9.4  	$(RM) -rf $(@D)/jdk $(@D)/netscape
     9.5  	$(CP) -R -p $(NASHORN_OUTPUTDIR)/nashorn_classes/* $(@D)/
     9.6  	$(FIXPATH) $(JAVA) \
     9.7 -	    -cp "$(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes" \
     9.8 +	    -Xbootclasspath/p:"$(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes" \
     9.9  	    jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D)
    9.10  	$(TOUCH) $@
    9.11  

    10.1 --- a/make/build.xml	Wed Mar 26 12:01:34 2014 -0700
    10.2 +++ b/make/build.xml	Tue Apr 01 11:44:05 2014 -0700
    10.3 @@ -42,6 +42,9 @@
    10.4      <condition property="hg.executable" value="/usr/local/bin/hg" else="hg">
    10.5        <available file="/usr/local/bin/hg"/>
    10.6      </condition>
    10.7 +    <condition property="git.executable" value="/usr/local/bin/git" else="git">
    10.8 +      <available file="/usr/local/bin/git"/>
    10.9 +    </condition>
   10.10      <!-- check if JDK already has ASM classes -->
   10.11      <available property="asm.available" classname="jdk.internal.org.objectweb.asm.Type"/>
   10.12      <!-- check if testng.jar is avaiable -->
   10.13 @@ -122,6 +125,7 @@
   10.14        <compilerarg value="-Xlint:unchecked"/>
   10.15        <compilerarg value="-Xlint:deprecation"/>
   10.16        <compilerarg value="-XDignore.symbol.file"/>
   10.17 +      <compilerarg value="-Xdiags:verbose"/>
   10.18      </javac>
   10.19      <copy todir="${build.classes.dir}/META-INF/services">
   10.20         <fileset dir="${meta.inf.dir}/services/"/>
   10.21 @@ -240,6 +244,7 @@
   10.22          <compilerarg value="-J-Djava.ext.dirs="/>
   10.23          <compilerarg value="-Xlint:unchecked"/>
   10.24          <compilerarg value="-Xlint:deprecation"/>
   10.25 +        <compilerarg value="-Xdiags:verbose"/>
   10.26      </javac>
   10.27  
   10.28      <copy todir="${build.test.classes.dir}/META-INF/services">
   10.29 @@ -250,6 +255,10 @@
   10.30         <fileset dir="${test.src.dir}/jdk/nashorn/internal/runtime/resources"/>
   10.31      </copy>
   10.32  
   10.33 +    <copy todir="${build.test.classes.dir}/jdk/nashorn/api/scripting/resources">
   10.34 +       <fileset dir="${test.src.dir}/jdk/nashorn/api/scripting/resources"/>
   10.35 +    </copy>
   10.36 +
   10.37      <!-- tests that check nashorn internals and internal API -->
   10.38      <jar jarfile="${nashorn.internal.tests.jar}">
   10.39        <fileset dir="${build.test.classes.dir}" excludes="**/api/**"/>
   10.40 @@ -279,6 +288,11 @@
   10.41      permission java.security.AllPermission;
   10.42  };
   10.43  
   10.44 +grant codeBase "file:/${basedir}/test/script/maptests/*" {
   10.45 +    permission java.io.FilePermission "${basedir}/test/script/maptests/*","read";
   10.46 +    permission java.lang.RuntimePermission "nashorn.debugMode";
   10.47 +};
   10.48 +
   10.49  grant codeBase "file:/${basedir}/test/script/basic/*" {
   10.50      permission java.io.FilePermission "${basedir}/test/script/-", "read";
   10.51      permission java.io.FilePermission "$${user.dir}", "read";
   10.52 @@ -459,18 +473,17 @@
   10.53  
   10.54    <!-- test262 test suite -->
   10.55    <target name="get-test262" depends="init" unless="${test-sys-prop.external.test262}">
   10.56 -    <!-- clone test262 mercurial repo -->
   10.57 -    <exec executable="${hg.executable}">
   10.58 +    <!-- clone test262 git repo -->
   10.59 +    <exec executable="${git.executable}">
   10.60         <arg value="clone"/>
   10.61 -       <arg value="http://hg.ecmascript.org/tests/test262"/>
   10.62 +       <arg value="https://github.com/tc39/test262"/>
   10.63         <arg value="${test.external.dir}/test262"/>
   10.64      </exec>
   10.65    </target>
   10.66    <target name="update-test262" depends="init" if="${test-sys-prop.external.test262}">
   10.67 -    <!-- update test262 mercurial repo -->
   10.68 -    <exec executable="${hg.executable}" dir="${test.external.dir}/test262">
   10.69 +    <!-- update test262 git repo -->
   10.70 +    <exec executable="${git.executable}" dir="${test.external.dir}/test262">
   10.71         <arg value="pull"/>
   10.72 -       <arg value="-u"/>
   10.73      </exec>
   10.74    </target>
   10.75  

    11.1 --- a/make/project.properties	Wed Mar 26 12:01:34 2014 -0700
    11.2 +++ b/make/project.properties	Tue Apr 01 11:44:05 2014 -0700
    11.3 @@ -112,6 +112,7 @@
    11.4  test.dir=test
    11.5  test.script.dir=test/script
    11.6  test.basic.dir=test/script/basic
    11.7 +test.maptests.dir=test/script/maptests
    11.8  test.error.dir=test/script/error
    11.9  test.sandbox.dir=test/script/sandbox
   11.10  test.trusted.dir=test/script/trusted
   11.11 @@ -121,7 +122,7 @@
   11.12  testjfx.dir=${test.script.dir}/jfx
   11.13  
   11.14  test-sys-prop.test.dir=${test.dir}
   11.15 -test-sys-prop.test.js.roots=${test.basic.dir} ${test.error.dir} ${test.sandbox.dir} ${test.trusted.dir}
   11.16 +test-sys-prop.test.js.roots=${test.basic.dir} ${test.maptests.dir} ${test.error.dir} ${test.sandbox.dir} ${test.trusted.dir}
   11.17  test-sys-prop.test262.suite.dir=${test262.suite.dir}
   11.18  test-sys-prop.es5conform.testcases.dir=${test.external.dir}/ES5Conform/TestCases
   11.19  test-sys-prop.test.basic.dir=${test.basic.dir}
   11.20 @@ -201,7 +202,7 @@
   11.21  
   11.22  # test262 test frameworks
   11.23  test262-test-sys-prop.test.js.framework=\
   11.24 -    --class-cache-size=0 \
   11.25 +    --class-cache-size=10 \
   11.26      --no-java \
   11.27      --no-typed-arrays \
   11.28      -timezone=PST \
   11.29 @@ -264,7 +265,7 @@
   11.30  run.test.jvmsecurityargs=-Xverify:all -Djava.security.manager -Djava.security.policy=${basedir}/build/nashorn.policy
   11.31  
   11.32  # VM options for script tests with @fork option
   11.33 -test-sys-prop.test.fork.jvm.options=${run.test.jvmargs.main} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs}
   11.34 +test-sys-prop.test.fork.jvm.options=${run.test.jvmargs.main} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs} -cp ${run.test.classpath}
   11.35  
   11.36  # path of rhino.jar for benchmarks
   11.37  rhino.jar=

    12.1 --- a/src/jdk/nashorn/api/scripting/NashornException.java	Wed Mar 26 12:01:34 2014 -0700
    12.2 +++ b/src/jdk/nashorn/api/scripting/NashornException.java	Tue Apr 01 11:44:05 2014 -0700
    12.3 @@ -29,6 +29,7 @@
    12.4  import java.util.List;
    12.5  import jdk.nashorn.internal.codegen.CompilerConstants;
    12.6  import jdk.nashorn.internal.runtime.ECMAErrors;
    12.7 +import jdk.nashorn.internal.runtime.ScriptObject;
    12.8  
    12.9  /**
   12.10   * This is base exception for all Nashorn exceptions. These originate from
   12.11 @@ -44,11 +45,13 @@
   12.12  @SuppressWarnings("serial")
   12.13  public abstract class NashornException extends RuntimeException {
   12.14      // script file name
   12.15 -    private final String fileName;
   12.16 +    private String fileName;
   12.17      // script line number
   12.18 -    private final int line;
   12.19 +    private int line;
   12.20      // script column number
   12.21 -    private final int column;
   12.22 +    private int column;
   12.23 +    // underlying ECMA error object - lazily initialized
   12.24 +    private Object ecmaError;
   12.25  
   12.26      /** script source name used for "engine.js" */
   12.27      public static final String ENGINE_SCRIPT_SOURCE_NAME = "nashorn:engine/resources/engine.js";
   12.28 @@ -122,6 +125,15 @@
   12.29      }
   12.30  
   12.31      /**
   12.32 +     * Set the source file name for this {@code NashornException}
   12.33 +     *
   12.34 +     * @param fileName the file name
   12.35 +     */
   12.36 +    public final void setFileName(final String fileName) {
   12.37 +        this.fileName = fileName;
   12.38 +    }
   12.39 +
   12.40 +    /**
   12.41       * Get the line number for this {@code NashornException}
   12.42       *
   12.43       * @return the line number
   12.44 @@ -131,15 +143,33 @@
   12.45      }
   12.46  
   12.47      /**
   12.48 +     * Set the line number for this {@code NashornException}
   12.49 +     *
   12.50 +     * @param line the line number
   12.51 +     */
   12.52 +    public final void setLineNumber(final int line) {
   12.53 +        this.line = line;
   12.54 +    }
   12.55 +
   12.56 +    /**
   12.57       * Get the column for this {@code NashornException}
   12.58       *
   12.59 -     * @return the column
   12.60 +     * @return the column number
   12.61       */
   12.62      public final int getColumnNumber() {
   12.63          return column;
   12.64      }
   12.65  
   12.66      /**
   12.67 +     * Set the column for this {@code NashornException}
   12.68 +     *
   12.69 +     * @param column the column number
   12.70 +     */
   12.71 +    public final void setColumnNumber(final int column) {
   12.72 +        this.column = column;
   12.73 +    }
   12.74 +
   12.75 +    /**
   12.76       * Returns array javascript stack frames from the given exception object.
   12.77       *
   12.78       * @param exception exception from which stack frames are retrieved and filtered
   12.79 @@ -155,6 +185,11 @@
   12.80                  if (methodName.equals(CompilerConstants.RUN_SCRIPT.symbolName())) {
   12.81                      methodName = "<program>";
   12.82                  }
   12.83 +
   12.84 +                if (methodName.contains(CompilerConstants.ANON_FUNCTION_PREFIX.symbolName())) {
   12.85 +                    methodName = "<anonymous>";
   12.86 +                }
   12.87 +
   12.88                  filtered.add(new StackTraceElement(className, methodName,
   12.89                          st.getFileName(), st.getLineNumber()));
   12.90              }
   12.91 @@ -188,4 +223,43 @@
   12.92          }
   12.93          return buf.toString();
   12.94      }
   12.95 +
   12.96 +    protected Object getThrown() {
   12.97 +        return null;
   12.98 +    }
   12.99 +
  12.100 +    protected NashornException initEcmaError(final ScriptObject global) {
  12.101 +        if (ecmaError != null) {
  12.102 +            return this; // initialized already!
  12.103 +        }
  12.104 +
  12.105 +        final Object thrown = getThrown();
  12.106 +        if (thrown instanceof ScriptObject) {
  12.107 +            setEcmaError(ScriptObjectMirror.wrap(thrown, global));
  12.108 +        } else {
  12.109 +            setEcmaError(thrown);
  12.110 +        }
  12.111 +
  12.112 +        return this;
  12.113 +    }
  12.114 +
  12.115 +    /**
  12.116 +     * Return the underlying ECMA error object, if available.
  12.117 +     *
  12.118 +     * @return underlying ECMA Error object's mirror or whatever was thrown
  12.119 +     *         from script such as a String, Number or a Boolean.
  12.120 +     */
  12.121 +    public Object getEcmaError() {
  12.122 +        return ecmaError;
  12.123 +    }
  12.124 +
  12.125 +    /**
  12.126 +     * Return the underlying ECMA error object, if available.
  12.127 +     *
  12.128 +     * @param ecmaError underlying ECMA Error object's mirror or whatever was thrown
  12.129 +     *         from script such as a String, Number or a Boolean.
  12.130 +     */
  12.131 +    public void setEcmaError(final Object ecmaError) {
  12.132 +        this.ecmaError = ecmaError;
  12.133 +    }
  12.134  }

    13.1 --- a/src/jdk/nashorn/api/scripting/NashornScriptEngine.java	Wed Mar 26 12:01:34 2014 -0700
    13.2 +++ b/src/jdk/nashorn/api/scripting/NashornScriptEngine.java	Tue Apr 01 11:44:05 2014 -0700
    13.3 @@ -57,9 +57,9 @@
    13.4  import javax.script.ScriptEngineFactory;
    13.5  import javax.script.ScriptException;
    13.6  import javax.script.SimpleBindings;
    13.7 +import jdk.nashorn.internal.objects.Global;
    13.8  import jdk.nashorn.internal.runtime.Context;
    13.9  import jdk.nashorn.internal.runtime.ErrorManager;
   13.10 -import jdk.nashorn.internal.runtime.GlobalObject;
   13.11  import jdk.nashorn.internal.runtime.Property;
   13.12  import jdk.nashorn.internal.runtime.ScriptFunction;
   13.13  import jdk.nashorn.internal.runtime.ScriptObject;
   13.14 @@ -99,7 +99,7 @@
   13.15      private final boolean             _global_per_engine;
   13.16      // This is the initial default Nashorn global object.
   13.17      // This is used as "shared" global if above option is true.
   13.18 -    private final ScriptObject        global;
   13.19 +    private final Global              global;
   13.20      // initialized bit late to be made 'final'.
   13.21      // Property object for "context" property of global object.
   13.22      private volatile Property         contextProperty;
   13.23 @@ -264,7 +264,7 @@
   13.24      public Object __noSuchProperty__(final Object self, final ScriptContext ctxt, final String name) {
   13.25          if (ctxt != null) {
   13.26              final int scope = ctxt.getAttributesScope(name);
   13.27 -            final ScriptObject ctxtGlobal = getNashornGlobalFrom(ctxt);
   13.28 +            final Global ctxtGlobal = getNashornGlobalFrom(ctxt);
   13.29              if (scope != -1) {
   13.30                  return ScriptObjectMirror.unwrap(ctxt.getAttribute(name, scope), ctxtGlobal);
   13.31              }
   13.32 @@ -317,7 +317,7 @@
   13.33          }
   13.34  
   13.35          ScriptObject realSelf = null;
   13.36 -        ScriptObject realGlobal = null;
   13.37 +        Global realGlobal = null;
   13.38          if(thiz == null) {
   13.39              // making interface out of global functions
   13.40              realSelf = realGlobal = getNashornGlobalFrom(context);
   13.41 @@ -346,7 +346,7 @@
   13.42          }
   13.43  
   13.44          try {
   13.45 -            final ScriptObject oldGlobal = Context.getGlobal();
   13.46 +            final Global oldGlobal = Context.getGlobal();
   13.47              final boolean globalChanged = (oldGlobal != realGlobal);
   13.48              try {
   13.49                  if (globalChanged) {
   13.50 @@ -371,7 +371,7 @@
   13.51      }
   13.52  
   13.53      // Retrieve nashorn Global object for a given ScriptContext object
   13.54 -    private ScriptObject getNashornGlobalFrom(final ScriptContext ctxt) {
   13.55 +    private Global getNashornGlobalFrom(final ScriptContext ctxt) {
   13.56          if (_global_per_engine) {
   13.57              // shared single global object for all ENGINE_SCOPE Bindings
   13.58              return global;
   13.59 @@ -380,18 +380,18 @@
   13.60          final Bindings bindings = ctxt.getBindings(ScriptContext.ENGINE_SCOPE);
   13.61          // is this Nashorn's own Bindings implementation?
   13.62          if (bindings instanceof ScriptObjectMirror) {
   13.63 -            final ScriptObject sobj = globalFromMirror((ScriptObjectMirror)bindings);
   13.64 -            if (sobj != null) {
   13.65 -                return sobj;
   13.66 +            final Global glob = globalFromMirror((ScriptObjectMirror)bindings);
   13.67 +            if (glob != null) {
   13.68 +                return glob;
   13.69              }
   13.70          }
   13.71  
   13.72          // Arbitrary user Bindings implementation. Look for NASHORN_GLOBAL in it!
   13.73          Object scope = bindings.get(NASHORN_GLOBAL);
   13.74          if (scope instanceof ScriptObjectMirror) {
   13.75 -            final ScriptObject sobj = globalFromMirror((ScriptObjectMirror)scope);
   13.76 -            if (sobj != null) {
   13.77 -                return sobj;
   13.78 +            final Global glob = globalFromMirror((ScriptObjectMirror)scope);
   13.79 +            if (glob != null) {
   13.80 +                return glob;
   13.81              }
   13.82          }
   13.83  
   13.84 @@ -399,14 +399,14 @@
   13.85          // Create new global instance mirror and associate with the Bindings.
   13.86          final ScriptObjectMirror mirror = createGlobalMirror(ctxt);
   13.87          bindings.put(NASHORN_GLOBAL, mirror);
   13.88 -        return mirror.getScriptObject();
   13.89 +        return mirror.getHomeGlobal();
   13.90      }
   13.91  
   13.92      // Retrieve nashorn Global object from a given ScriptObjectMirror
   13.93 -    private ScriptObject globalFromMirror(final ScriptObjectMirror mirror) {
   13.94 +    private Global globalFromMirror(final ScriptObjectMirror mirror) {
   13.95          ScriptObject sobj = mirror.getScriptObject();
   13.96 -        if (sobj instanceof GlobalObject && isOfContext(sobj, nashornContext)) {
   13.97 -            return sobj;
   13.98 +        if (sobj instanceof Global && isOfContext((Global)sobj, nashornContext)) {
   13.99 +            return (Global)sobj;
  13.100          }
  13.101  
  13.102          return null;
  13.103 @@ -414,15 +414,15 @@
  13.104  
  13.105      // Create a new ScriptObjectMirror wrapping a newly created Nashorn Global object
  13.106      private ScriptObjectMirror createGlobalMirror(final ScriptContext ctxt) {
  13.107 -        final ScriptObject newGlobal = createNashornGlobal(ctxt);
  13.108 +        final Global newGlobal = createNashornGlobal(ctxt);
  13.109          return new ScriptObjectMirror(newGlobal, newGlobal);
  13.110      }
  13.111  
  13.112      // Create a new Nashorn Global object
  13.113 -    private ScriptObject createNashornGlobal(final ScriptContext ctxt) {
  13.114 -        final ScriptObject newGlobal = AccessController.doPrivileged(new PrivilegedAction<ScriptObject>() {
  13.115 +    private Global createNashornGlobal(final ScriptContext ctxt) {
  13.116 +        final Global newGlobal = AccessController.doPrivileged(new PrivilegedAction<Global>() {
  13.117              @Override
  13.118 -            public ScriptObject run() {
  13.119 +            public Global run() {
  13.120                  try {
  13.121                      return nashornContext.newGlobal();
  13.122                  } catch (final RuntimeException e) {
  13.123 @@ -460,7 +460,7 @@
  13.124      }
  13.125  
  13.126      // scripts should see "context" and "engine" as variables in the given global object
  13.127 -    private void setContextVariables(final ScriptObject ctxtGlobal, final ScriptContext ctxt) {
  13.128 +    private void setContextVariables(final Global ctxtGlobal, final ScriptContext ctxt) {
  13.129          // set "context" global variable via contextProperty - because this
  13.130          // property is non-writable
  13.131          contextProperty.setObjectValue(ctxtGlobal, ctxtGlobal, ctxt, false);
  13.132 @@ -470,7 +470,7 @@
  13.133          }
  13.134          // if no arguments passed, expose it
  13.135          if (! (args instanceof ScriptObject)) {
  13.136 -            args = ((GlobalObject)ctxtGlobal).wrapAsObject(args);
  13.137 +            args = ctxtGlobal.wrapAsObject(args);
  13.138              ctxtGlobal.set("arguments", args, false);
  13.139          }
  13.140      }
  13.141 @@ -478,16 +478,19 @@
  13.142      private Object invokeImpl(final Object selfObject, final String name, final Object... args) throws ScriptException, NoSuchMethodException {
  13.143          name.getClass(); // null check
  13.144  
  13.145 +        Global invokeGlobal = null;
  13.146          ScriptObjectMirror selfMirror = null;
  13.147          if (selfObject instanceof ScriptObjectMirror) {
  13.148              selfMirror = (ScriptObjectMirror)selfObject;
  13.149              if (! isOfContext(selfMirror.getHomeGlobal(), nashornContext)) {
  13.150                  throw new IllegalArgumentException(getMessage("script.object.from.another.engine"));
  13.151              }
  13.152 +            invokeGlobal = selfMirror.getHomeGlobal();
  13.153          } else if (selfObject instanceof ScriptObject) {
  13.154              // invokeMethod called from script code - in which case we may get 'naked' ScriptObject
  13.155              // Wrap it with oldGlobal to make a ScriptObjectMirror for the same.
  13.156 -            final ScriptObject oldGlobal = Context.getGlobal();
  13.157 +            final Global oldGlobal = Context.getGlobal();
  13.158 +            invokeGlobal = oldGlobal;
  13.159              if (oldGlobal == null) {
  13.160                  throw new IllegalArgumentException(getMessage("no.current.nashorn.global"));
  13.161              }
  13.162 @@ -499,7 +502,8 @@
  13.163              selfMirror = (ScriptObjectMirror)ScriptObjectMirror.wrap(selfObject, oldGlobal);
  13.164          } else if (selfObject == null) {
  13.165              // selfObject is null => global function call
  13.166 -            final ScriptObject ctxtGlobal = getNashornGlobalFrom(context);
  13.167 +            final Global ctxtGlobal = getNashornGlobalFrom(context);
  13.168 +            invokeGlobal = ctxtGlobal;
  13.169              selfMirror = (ScriptObjectMirror)ScriptObjectMirror.wrap(ctxtGlobal, ctxtGlobal);
  13.170          }
  13.171  
  13.172 @@ -511,7 +515,7 @@
  13.173                  if (cause instanceof NoSuchMethodException) {
  13.174                      throw (NoSuchMethodException)cause;
  13.175                  }
  13.176 -                throwAsScriptException(e);
  13.177 +                throwAsScriptException(e, invokeGlobal);
  13.178                  throw new AssertionError("should not reach here");
  13.179              }
  13.180          }
  13.181 @@ -528,11 +532,11 @@
  13.182          return evalImpl(script, ctxt, getNashornGlobalFrom(ctxt));
  13.183      }
  13.184  
  13.185 -    private Object evalImpl(final ScriptFunction script, final ScriptContext ctxt, final ScriptObject ctxtGlobal) throws ScriptException {
  13.186 +    private Object evalImpl(final ScriptFunction script, final ScriptContext ctxt, final Global ctxtGlobal) throws ScriptException {
  13.187          if (script == null) {
  13.188              return null;
  13.189          }
  13.190 -        final ScriptObject oldGlobal = Context.getGlobal();
  13.191 +        final Global oldGlobal = Context.getGlobal();
  13.192          final boolean globalChanged = (oldGlobal != ctxtGlobal);
  13.193          try {
  13.194              if (globalChanged) {
  13.195 @@ -545,7 +549,7 @@
  13.196              }
  13.197              return ScriptObjectMirror.translateUndefined(ScriptObjectMirror.wrap(ScriptRuntime.apply(script, ctxtGlobal), ctxtGlobal));
  13.198          } catch (final Exception e) {
  13.199 -            throwAsScriptException(e);
  13.200 +            throwAsScriptException(e, ctxtGlobal);
  13.201              throw new AssertionError("should not reach here");
  13.202          } finally {
  13.203              if (globalChanged) {
  13.204 @@ -554,7 +558,7 @@
  13.205          }
  13.206      }
  13.207  
  13.208 -    private static void throwAsScriptException(final Exception e) throws ScriptException {
  13.209 +    private static void throwAsScriptException(final Exception e, final Global global) throws ScriptException {
  13.210          if (e instanceof ScriptException) {
  13.211              throw (ScriptException)e;
  13.212          } else if (e instanceof NashornException) {
  13.213 @@ -562,6 +566,7 @@
  13.214              final ScriptException se = new ScriptException(
  13.215                  ne.getMessage(), ne.getFileName(),
  13.216                  ne.getLineNumber(), ne.getColumnNumber());
  13.217 +            ne.initEcmaError(global);
  13.218              se.initCause(e);
  13.219              throw se;
  13.220          } else if (e instanceof RuntimeException) {
  13.221 @@ -577,7 +582,7 @@
  13.222          return new CompiledScript() {
  13.223              @Override
  13.224              public Object eval(final ScriptContext ctxt) throws ScriptException {
  13.225 -                final ScriptObject globalObject = getNashornGlobalFrom(ctxt);
  13.226 +                final Global globalObject = getNashornGlobalFrom(ctxt);
  13.227                  // Are we running the script in the correct global?
  13.228                  if (func.getScope() == globalObject) {
  13.229                      return evalImpl(func, ctxt, globalObject);
  13.230 @@ -597,8 +602,8 @@
  13.231          return compileImpl(source, getNashornGlobalFrom(ctxt));
  13.232      }
  13.233  
  13.234 -    private ScriptFunction compileImpl(final Source source, final ScriptObject newGlobal) throws ScriptException {
  13.235 -        final ScriptObject oldGlobal = Context.getGlobal();
  13.236 +    private ScriptFunction compileImpl(final Source source, final Global newGlobal) throws ScriptException {
  13.237 +        final Global oldGlobal = Context.getGlobal();
  13.238          final boolean globalChanged = (oldGlobal != newGlobal);
  13.239          try {
  13.240              if (globalChanged) {
  13.241 @@ -607,7 +612,7 @@
  13.242  
  13.243              return nashornContext.compileScript(source, newGlobal);
  13.244          } catch (final Exception e) {
  13.245 -            throwAsScriptException(e);
  13.246 +            throwAsScriptException(e, newGlobal);
  13.247              throw new AssertionError("should not reach here");
  13.248          } finally {
  13.249              if (globalChanged) {
  13.250 @@ -623,6 +628,11 @@
  13.251                  continue;
  13.252              }
  13.253  
  13.254 +            // skip check for default methods - non-abstract, interface methods
  13.255 +            if (! Modifier.isAbstract(method.getModifiers())) {
  13.256 +                continue;
  13.257 +            }
  13.258 +
  13.259              Object obj = sobj.get(method.getName());
  13.260              if (! (obj instanceof ScriptFunction)) {
  13.261                  return false;
  13.262 @@ -631,8 +641,7 @@
  13.263          return true;
  13.264      }
  13.265  
  13.266 -    private static boolean isOfContext(final ScriptObject global, final Context context) {
  13.267 -        assert global instanceof GlobalObject: "Not a Global object";
  13.268 -        return ((GlobalObject)global).isOfContext(context);
  13.269 +    private static boolean isOfContext(final Global global, final Context context) {
  13.270 +        return global.isOfContext(context);
  13.271      }
  13.272  }

    14.1 --- a/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java	Wed Mar 26 12:01:34 2014 -0700
    14.2 +++ b/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java	Tue Apr 01 11:44:05 2014 -0700
    14.3 @@ -25,6 +25,7 @@
    14.4  
    14.5  package jdk.nashorn.api.scripting;
    14.6  
    14.7 +import java.nio.ByteBuffer;
    14.8  import java.security.AccessControlContext;
    14.9  import java.security.AccessController;
   14.10  import java.security.Permissions;
   14.11 @@ -41,9 +42,10 @@
   14.12  import java.util.Set;
   14.13  import java.util.concurrent.Callable;
   14.14  import javax.script.Bindings;
   14.15 +import jdk.nashorn.internal.objects.Global;
   14.16 +import jdk.nashorn.internal.runtime.arrays.ArrayData;
   14.17  import jdk.nashorn.internal.runtime.ConsString;
   14.18  import jdk.nashorn.internal.runtime.Context;
   14.19 -import jdk.nashorn.internal.runtime.GlobalObject;
   14.20  import jdk.nashorn.internal.runtime.JSType;
   14.21  import jdk.nashorn.internal.runtime.ScriptFunction;
   14.22  import jdk.nashorn.internal.runtime.ScriptObject;
   14.23 @@ -62,7 +64,7 @@
   14.24      private static final AccessControlContext GET_CONTEXT_ACC_CTXT = getContextAccCtxt();
   14.25  
   14.26      private final ScriptObject sobj;
   14.27 -    private final ScriptObject global;
   14.28 +    private final Global  global;
   14.29      private final boolean strict;
   14.30  
   14.31      @Override
   14.32 @@ -93,7 +95,7 @@
   14.33  
   14.34      @Override
   14.35      public Object call(final Object thiz, final Object... args) {
   14.36 -        final ScriptObject oldGlobal = Context.getGlobal();
   14.37 +        final Global oldGlobal = Context.getGlobal();
   14.38          final boolean globalChanged = (oldGlobal != global);
   14.39  
   14.40          try {
   14.41 @@ -108,6 +110,8 @@
   14.42              }
   14.43  
   14.44              throw new RuntimeException("not a function: " + toString());
   14.45 +        } catch (final NashornException ne) {
   14.46 +            throw ne.initEcmaError(global);
   14.47          } catch (final RuntimeException | Error e) {
   14.48              throw e;
   14.49          } catch (final Throwable t) {
   14.50 @@ -121,7 +125,7 @@
   14.51  
   14.52      @Override
   14.53      public Object newObject(final Object... args) {
   14.54 -        final ScriptObject oldGlobal = Context.getGlobal();
   14.55 +        final Global oldGlobal = Context.getGlobal();
   14.56          final boolean globalChanged = (oldGlobal != global);
   14.57  
   14.58          try {
   14.59 @@ -135,6 +139,8 @@
   14.60              }
   14.61  
   14.62              throw new RuntimeException("not a constructor: " + toString());
   14.63 +        } catch (final NashornException ne) {
   14.64 +            throw ne.initEcmaError(global);
   14.65          } catch (final RuntimeException | Error e) {
   14.66              throw e;
   14.67          } catch (final Throwable t) {
   14.68 @@ -165,7 +171,7 @@
   14.69  
   14.70      public Object callMember(final String functionName, final Object... args) {
   14.71          functionName.getClass(); // null check
   14.72 -        final ScriptObject oldGlobal = Context.getGlobal();
   14.73 +        final Global oldGlobal = Context.getGlobal();
   14.74          final boolean globalChanged = (oldGlobal != global);
   14.75  
   14.76          try {
   14.77 @@ -182,6 +188,8 @@
   14.78              }
   14.79  
   14.80              throw new NoSuchMethodException("No such function " + functionName);
   14.81 +        } catch (final NashornException ne) {
   14.82 +            throw ne.initEcmaError(global);
   14.83          } catch (final RuntimeException | Error e) {
   14.84              throw e;
   14.85          } catch (final Throwable t) {
   14.86 @@ -253,6 +261,22 @@
   14.87          });
   14.88      }
   14.89  
   14.90 +    /**
   14.91 +     * Nashorn extension: setIndexedPropertiesToExternalArrayData.
   14.92 +     * set indexed properties be exposed from a given nio ByteBuffer.
   14.93 +     *
   14.94 +     * @param buf external buffer - should be a nio ByteBuffer
   14.95 +     */
   14.96 +    public void setIndexedPropertiesToExternalArrayData(final ByteBuffer buf) {
   14.97 +        inGlobal(new Callable<Void>() {
   14.98 +            @Override public Void call() {
   14.99 +                sobj.setArray(ArrayData.allocate(buf));
  14.100 +                return null;
  14.101 +            }
  14.102 +        });
  14.103 +    }
  14.104 +
  14.105 +
  14.106      @Override
  14.107      public boolean isInstance(final Object obj) {
  14.108          if (! (obj instanceof ScriptObjectMirror)) {
  14.109 @@ -618,7 +642,7 @@
  14.110       */
  14.111      public static Object wrap(final Object obj, final Object homeGlobal) {
  14.112          if(obj instanceof ScriptObject) {
  14.113 -            return homeGlobal instanceof ScriptObject ? new ScriptObjectMirror((ScriptObject)obj, (ScriptObject)homeGlobal) : obj;
  14.114 +            return homeGlobal instanceof Global ? new ScriptObjectMirror((ScriptObject)obj, (Global)homeGlobal) : obj;
  14.115          }
  14.116          if(obj instanceof ConsString) {
  14.117              return obj.toString();
  14.118 @@ -686,13 +710,13 @@
  14.119  
  14.120      // package-privates below this.
  14.121  
  14.122 -    ScriptObjectMirror(final ScriptObject sobj, final ScriptObject global) {
  14.123 +    ScriptObjectMirror(final ScriptObject sobj, final Global global) {
  14.124          assert sobj != null : "ScriptObjectMirror on null!";
  14.125 -        assert global instanceof GlobalObject : "global is not a GlobalObject";
  14.126 +        assert global != null : "home Global is null";
  14.127  
  14.128          this.sobj = sobj;
  14.129          this.global = global;
  14.130 -        this.strict = ((GlobalObject)global).isStrictContext();
  14.131 +        this.strict = global.isStrictContext();
  14.132      }
  14.133  
  14.134      // accessors for script engine
  14.135 @@ -700,7 +724,7 @@
  14.136          return sobj;
  14.137      }
  14.138  
  14.139 -    ScriptObject getHomeGlobal() {
  14.140 +    Global getHomeGlobal() {
  14.141          return global;
  14.142      }
  14.143  
  14.144 @@ -710,13 +734,15 @@
  14.145  
  14.146      // internals only below this.
  14.147      private <V> V inGlobal(final Callable<V> callable) {
  14.148 -        final ScriptObject oldGlobal = Context.getGlobal();
  14.149 +        final Global oldGlobal = Context.getGlobal();
  14.150          final boolean globalChanged = (oldGlobal != global);
  14.151          if (globalChanged) {
  14.152              Context.setGlobal(global);
  14.153          }
  14.154          try {
  14.155              return callable.call();
  14.156 +        } catch (final NashornException ne) {
  14.157 +            throw ne.initEcmaError(global);
  14.158          } catch (final RuntimeException e) {
  14.159              throw e;
  14.160          } catch (final Exception e) {

    15.1 --- a/src/jdk/nashorn/internal/codegen/Attr.java	Wed Mar 26 12:01:34 2014 -0700
    15.2 +++ b/src/jdk/nashorn/internal/codegen/Attr.java	Tue Apr 01 11:44:05 2014 -0700
    15.3 @@ -375,10 +375,11 @@
    15.4       * @return Symbol for given name or null for redefinition.
    15.5       */
    15.6      private Symbol defineSymbol(final Block block, final String name, final int symbolFlags) {
    15.7 -        int    flags  = symbolFlags;
    15.8 -        Symbol symbol = findSymbol(block, name); // Locate symbol.
    15.9 +        int     flags    = symbolFlags;
   15.10 +        Symbol  symbol   = findSymbol(block, name); // Locate symbol.
   15.11 +        boolean isGlobal = (flags & KINDMASK) == IS_GLOBAL;
   15.12  
   15.13 -        if ((flags & KINDMASK) == IS_GLOBAL) {
   15.14 +        if (isGlobal) {
   15.15              flags |= IS_SCOPE;
   15.16          }
   15.17  
   15.18 @@ -414,6 +415,8 @@
   15.19              // Determine where to create it.
   15.20              if ((flags & Symbol.KINDMASK) == IS_VAR && ((flags & IS_INTERNAL) == IS_INTERNAL || (flags & IS_LET) == IS_LET)) {
   15.21                  symbolBlock = block; //internal vars are always defined in the block closest to them
   15.22 +            } else if (isGlobal) {
   15.23 +                symbolBlock = lc.getOutermostFunction().getBody();
   15.24              } else {
   15.25                  symbolBlock = lc.getFunctionBody(function);
   15.26              }

    16.1 --- a/src/jdk/nashorn/internal/codegen/CodeGenerator.java	Wed Mar 26 12:01:34 2014 -0700
    16.2 +++ b/src/jdk/nashorn/internal/codegen/CodeGenerator.java	Tue Apr 01 11:44:05 2014 -0700
    16.3 @@ -685,7 +685,7 @@
    16.4              private void scopeCall(final IdentNode node, final int flags) {
    16.5                  load(node, Type.OBJECT); // Type.OBJECT as foo() makes no sense if foo == 3
    16.6                  // ScriptFunction will see CALLSITE_SCOPE and will bind scope accordingly.
    16.7 -                method.loadNull(); //the 'this'
    16.8 +                method.loadUndefined(Type.OBJECT); //the 'this' object
    16.9                  method.dynamicCall(callNodeType, 2 + loadArgs(args), flags);
   16.10              }
   16.11  
   16.12 @@ -818,7 +818,7 @@
   16.13              protected boolean enterDefault(final Node node) {
   16.14                  // Load up function.
   16.15                  load(function, Type.OBJECT); //TODO, e.g. booleans can be used as functions
   16.16 -                method.loadNull(); // ScriptFunction will figure out the correct this when it sees CALLSITE_SCOPE
   16.17 +                method.loadUndefined(Type.OBJECT); // ScriptFunction will figure out the correct this when it sees CALLSITE_SCOPE
   16.18                  method.dynamicCall(callNodeType, 2 + loadArgs(args), getCallSiteFlags() | CALLSITE_SCOPE);
   16.19  
   16.20                  return false;
   16.21 @@ -2023,8 +2023,6 @@
   16.22              return false;
   16.23          }
   16.24  
   16.25 -        method._new(ECMAException.class).dup();
   16.26 -
   16.27          final Source source     = lc.getCurrentFunction().getSource();
   16.28  
   16.29          final Expression expression = throwNode.getExpression();
   16.30 @@ -2037,7 +2035,7 @@
   16.31          method.load(source.getName());
   16.32          method.load(line);
   16.33          method.load(column);
   16.34 -        method.invoke(ECMAException.THROW_INIT);
   16.35 +        method.invoke(ECMAException.CREATE);
   16.36  
   16.37          method.athrow();
   16.38  

    17.1 --- a/src/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java	Wed Mar 26 12:01:34 2014 -0700
    17.2 +++ b/src/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java	Tue Apr 01 11:44:05 2014 -0700
    17.3 @@ -158,7 +158,7 @@
    17.4          if (scopeCalls.containsKey(scopeCall)) {
    17.5              return scopeCalls.get(scopeCall);
    17.6          }
    17.7 -        scopeCall.setClassAndName(unit, getCurrentFunction().uniqueName("scopeCall"));
    17.8 +        scopeCall.setClassAndName(unit, getCurrentFunction().uniqueName(":scopeCall"));
    17.9          scopeCalls.put(scopeCall, scopeCall);
   17.10          return scopeCall;
   17.11      }
   17.12 @@ -177,7 +177,7 @@
   17.13          if (scopeCalls.containsKey(scopeCall)) {
   17.14              return scopeCalls.get(scopeCall);
   17.15          }
   17.16 -        scopeCall.setClassAndName(unit, getCurrentFunction().uniqueName("scopeCall"));
   17.17 +        scopeCall.setClassAndName(unit, getCurrentFunction().uniqueName(":scopeCall"));
   17.18          scopeCalls.put(scopeCall, scopeCall);
   17.19          return scopeCall;
   17.20      }

    18.1 --- a/src/jdk/nashorn/internal/codegen/Compiler.java	Wed Mar 26 12:01:34 2014 -0700
    18.2 +++ b/src/jdk/nashorn/internal/codegen/Compiler.java	Tue Apr 01 11:44:05 2014 -0700
    18.3 @@ -85,6 +85,8 @@
    18.4  
    18.5      private Source source;
    18.6  
    18.7 +    private String sourceName;
    18.8 +
    18.9      private final Map<String, byte[]> bytecode;
   18.10  
   18.11      private final Set<CompileUnit> compileUnits;
   18.12 @@ -267,6 +269,7 @@
   18.13                  append('$').
   18.14                  append(safeSourceName(functionNode.getSource()));
   18.15          this.source = functionNode.getSource();
   18.16 +        this.sourceName = functionNode.getSourceName();
   18.17          this.scriptName = sb.toString();
   18.18      }
   18.19  
   18.20 @@ -573,7 +576,7 @@
   18.21      }
   18.22  
   18.23      private CompileUnit initCompileUnit(final String unitClassName, final long initialWeight) {
   18.24 -        final ClassEmitter classEmitter = new ClassEmitter(env, source.getName(), unitClassName, strict);
   18.25 +        final ClassEmitter classEmitter = new ClassEmitter(env, sourceName, unitClassName, strict);
   18.26          final CompileUnit  compileUnit  = new CompileUnit(unitClassName, classEmitter, initialWeight);
   18.27  
   18.28          classEmitter.begin();

    19.1 --- a/src/jdk/nashorn/internal/codegen/CompilerConstants.java	Wed Mar 26 12:01:34 2014 -0700
    19.2 +++ b/src/jdk/nashorn/internal/codegen/CompilerConstants.java	Tue Apr 01 11:44:05 2014 -0700
    19.3 @@ -41,6 +41,7 @@
    19.4   */
    19.5  
    19.6  public enum CompilerConstants {
    19.7 +
    19.8      /** the __FILE__ variable */
    19.9      __FILE__,
   19.10  
   19.11 @@ -75,7 +76,7 @@
   19.12      DEFAULT_SCRIPT_NAME("Script"),
   19.13  
   19.14      /** function prefix for anonymous functions */
   19.15 -    FUNCTION_PREFIX("function$"),
   19.16 +    ANON_FUNCTION_PREFIX("L:"),
   19.17  
   19.18      /** method name for Java method that is script entry point */
   19.19      RUN_SCRIPT("runScript"),
   19.20 @@ -149,26 +150,31 @@
   19.21      ALLOCATE("allocate"),
   19.22  
   19.23      /** prefix for split methods, @see Splitter */
   19.24 -    SPLIT_PREFIX("$split"),
   19.25 +    SPLIT_PREFIX(":split"),
   19.26  
   19.27      /** prefix for split array method and slot */
   19.28 -    SPLIT_ARRAY_ARG("split_array", 3),
   19.29 +    SPLIT_ARRAY_ARG(":split_array", 3),
   19.30  
   19.31      /** get string from constant pool */
   19.32 -    GET_STRING("$getString"),
   19.33 +    GET_STRING(":getString"),
   19.34  
   19.35      /** get map */
   19.36 -    GET_MAP("$getMap"),
   19.37 +    GET_MAP(":getMap"),
   19.38  
   19.39      /** get map */
   19.40 -    SET_MAP("$setMap"),
   19.41 +    SET_MAP(":setMap"),
   19.42  
   19.43      /** get array prefix */
   19.44 -    GET_ARRAY_PREFIX("$get"),
   19.45 +    GET_ARRAY_PREFIX(":get"),
   19.46  
   19.47      /** get array suffix */
   19.48      GET_ARRAY_SUFFIX("$array");
   19.49  
   19.50 +    /**
   19.51 +     * Prefix used for internal methods generated in script clases.
   19.52 +     */
   19.53 +    public static final String INTERNAL_METHOD_PREFIX = ":";
   19.54 +
   19.55      private final String symbolName;
   19.56      private final Class<?> type;
   19.57      private final int slot;

    20.1 --- a/src/jdk/nashorn/internal/codegen/ConstantData.java	Wed Mar 26 12:01:34 2014 -0700
    20.2 +++ b/src/jdk/nashorn/internal/codegen/ConstantData.java	Tue Apr 01 11:44:05 2014 -0700
    20.3 @@ -25,6 +25,9 @@
    20.4  
    20.5  package jdk.nashorn.internal.codegen;
    20.6  
    20.7 +import jdk.nashorn.internal.runtime.Property;
    20.8 +import jdk.nashorn.internal.runtime.PropertyMap;
    20.9 +
   20.10  import java.util.ArrayList;
   20.11  import java.util.Arrays;
   20.12  import java.util.HashMap;
   20.13 @@ -110,6 +113,43 @@
   20.14      }
   20.15  
   20.16      /**
   20.17 +     * {@link PropertyMap} wrapper class that provides implementations for the {@code hashCode} and {@code equals}
   20.18 +     * methods that are based on the map layout. {@code PropertyMap} itself inherits the identity based implementations
   20.19 +     * from {@code java.lang.Object}.
   20.20 +     */
   20.21 +    private static class PropertyMapWrapper {
   20.22 +        private final PropertyMap propertyMap;
   20.23 +        private final int hashCode;
   20.24 +
   20.25 +        public PropertyMapWrapper(final PropertyMap map) {
   20.26 +            int hash = 0;
   20.27 +            for (final Property property : map.getProperties()) {
   20.28 +                hash = hash << 7 ^ hash >> 7;
   20.29 +                hash ^= property.hashCode();
   20.30 +            }
   20.31 +            this.hashCode = hash;
   20.32 +            this.propertyMap = map;
   20.33 +        }
   20.34 +
   20.35 +        @Override
   20.36 +        public int hashCode() {
   20.37 +            return hashCode;
   20.38 +        }
   20.39 +
   20.40 +        @Override
   20.41 +        public boolean equals(final Object other) {
   20.42 +            if (!(other instanceof PropertyMapWrapper)) {
   20.43 +                return false;
   20.44 +            }
   20.45 +
   20.46 +            final Property[] ownProperties = propertyMap.getProperties();
   20.47 +            final Property[] otherProperties = ((PropertyMapWrapper) other).propertyMap.getProperties();
   20.48 +
   20.49 +            return Arrays.equals(ownProperties, otherProperties);
   20.50 +        }
   20.51 +    }
   20.52 +
   20.53 +    /**
   20.54       * Constructor
   20.55       */
   20.56      ConstantData() {
   20.57 @@ -145,7 +185,14 @@
   20.58       * @return the index in the constant pool that the object was given
   20.59       */
   20.60      public int add(final Object object) {
   20.61 -        final Object  entry = object.getClass().isArray() ? new ArrayWrapper(object) : object;
   20.62 +        final Object  entry;
   20.63 +        if (object.getClass().isArray()) {
   20.64 +            entry = new ArrayWrapper(object);
   20.65 +        } else if (object instanceof PropertyMap) {
   20.66 +            entry = new PropertyMapWrapper((PropertyMap) object);
   20.67 +        } else {
   20.68 +            entry = object;
   20.69 +        }
   20.70          final Integer value = objectMap.get(entry);
   20.71  
   20.72          if (value != null) {

    21.1 --- a/src/jdk/nashorn/internal/codegen/MethodEmitter.java	Wed Mar 26 12:01:34 2014 -0700
    21.2 +++ b/src/jdk/nashorn/internal/codegen/MethodEmitter.java	Tue Apr 01 11:44:05 2014 -0700
    21.3 @@ -1130,7 +1130,11 @@
    21.4              popType(Type.OBJECT);
    21.5          }
    21.6  
    21.7 -        method.visitMethodInsn(opcode, className, methodName, methodDescriptor);
    21.8 +        if (opcode == INVOKEINTERFACE) {
    21.9 +            method.visitMethodInsn(opcode, className, methodName, methodDescriptor, true);
   21.10 +        } else {
   21.11 +            method.visitMethodInsn(opcode, className, methodName, methodDescriptor, false);
   21.12 +        }
   21.13  
   21.14          if (returnType != null) {
   21.15              pushType(returnType);

    22.1 --- a/src/jdk/nashorn/internal/codegen/SharedScopeCall.java	Wed Mar 26 12:01:34 2014 -0700
    22.2 +++ b/src/jdk/nashorn/internal/codegen/SharedScopeCall.java	Tue Apr 01 11:44:05 2014 -0700
    22.3 @@ -156,7 +156,7 @@
    22.4          if (isCall) {
    22.5              method.convert(Type.OBJECT);
    22.6              // ScriptFunction will see CALLSITE_SCOPE and will bind scope accordingly.
    22.7 -            method.loadNull();
    22.8 +            method.loadUndefined(Type.OBJECT);
    22.9              int slot = 2;
   22.10              for (final Type type : paramTypes) {
   22.11                  method.load(type, slot++);

    23.1 --- a/src/jdk/nashorn/internal/codegen/types/Type.java	Wed Mar 26 12:01:34 2014 -0700
    23.2 +++ b/src/jdk/nashorn/internal/codegen/types/Type.java	Tue Apr 01 11:44:05 2014 -0700
    23.3 @@ -261,7 +261,7 @@
    23.4      }
    23.5  
    23.6      static void invokeStatic(final MethodVisitor method, final Call call) {
    23.7 -        method.visitMethodInsn(INVOKESTATIC, call.className(), call.name(), call.descriptor());
    23.8 +        method.visitMethodInsn(INVOKESTATIC, call.className(), call.name(), call.descriptor(), false);
    23.9      }
   23.10  
   23.11      /**

    24.1 --- a/src/jdk/nashorn/internal/ir/FunctionNode.java	Wed Mar 26 12:01:34 2014 -0700
    24.2 +++ b/src/jdk/nashorn/internal/ir/FunctionNode.java	Tue Apr 01 11:44:05 2014 -0700
    24.3 @@ -29,6 +29,7 @@
    24.4  import java.util.EnumSet;
    24.5  import java.util.HashSet;
    24.6  import java.util.List;
    24.7 +import java.util.Objects;
    24.8  import java.util.Set;
    24.9  import jdk.nashorn.internal.codegen.CompileUnit;
   24.10  import jdk.nashorn.internal.codegen.Compiler;
   24.11 @@ -138,6 +139,9 @@
   24.12      /** Function flags. */
   24.13      private final int flags;
   24.14  
   24.15 +    /** //@ sourceURL or //# sourceURL for program function nodes */
   24.16 +    private final String sourceURL;
   24.17 +
   24.18      private final int lineNumber;
   24.19  
   24.20      /** Is anonymous function flag. */
   24.21 @@ -160,11 +164,11 @@
   24.22      public static final int HAS_EVAL                    = 1 << 5;
   24.23  
   24.24      /** Does a nested function contain eval? If it does, then all variables in this function might be get/set by it. */
   24.25 -    public static final int HAS_NESTED_EVAL = 1 << 6;
   24.26 +    public static final int HAS_NESTED_EVAL             = 1 << 6;
   24.27  
   24.28      /** Does this function have any blocks that create a scope? This is used to determine if the function needs to
   24.29       * have a local variable slot for the scope symbol. */
   24.30 -    public static final int HAS_SCOPE_BLOCK = 1 << 7;
   24.31 +    public static final int HAS_SCOPE_BLOCK             = 1 << 7;
   24.32  
   24.33      /**
   24.34       * Flag this function as one that defines the identifier "arguments" as a function parameter or nested function
   24.35 @@ -193,6 +197,9 @@
   24.36      /** Can this function be specialized? */
   24.37      public static final int CAN_SPECIALIZE              = 1 << 14;
   24.38  
   24.39 +    /** Does this function use the "this" keyword? */
   24.40 +    public static final int USES_THIS                   = 1 << 15;
   24.41 +
   24.42      /** Does this function or any nested functions contain an eval? */
   24.43      private static final int HAS_DEEP_EVAL = HAS_EVAL | HAS_NESTED_EVAL;
   24.44  
   24.45 @@ -223,6 +230,7 @@
   24.46       * @param parameters parameter list
   24.47       * @param kind       kind of function as in {@link FunctionNode.Kind}
   24.48       * @param flags      initial flags
   24.49 +     * @param sourceURL  sourceURL specified in script (optional)
   24.50       */
   24.51      public FunctionNode(
   24.52          final Source source,
   24.53 @@ -235,7 +243,8 @@
   24.54          final String name,
   24.55          final List<IdentNode> parameters,
   24.56          final FunctionNode.Kind kind,
   24.57 -        final int flags) {
   24.58 +        final int flags,
   24.59 +        final String sourceURL) {
   24.60          super(token, finish);
   24.61  
   24.62          this.source           = source;
   24.63 @@ -250,6 +259,7 @@
   24.64          this.compilationState = EnumSet.of(CompilationState.INITIALIZED);
   24.65          this.declaredSymbols  = new HashSet<>();
   24.66          this.flags            = flags;
   24.67 +        this.sourceURL        = sourceURL;
   24.68          this.compileUnit      = null;
   24.69          this.body             = null;
   24.70          this.snapshot         = null;
   24.71 @@ -260,6 +270,7 @@
   24.72          final FunctionNode functionNode,
   24.73          final long lastToken,
   24.74          final int flags,
   24.75 +        final String sourceURL,
   24.76          final String name,
   24.77          final Type returnType,
   24.78          final CompileUnit compileUnit,
   24.79 @@ -271,6 +282,7 @@
   24.80          super(functionNode);
   24.81          this.lineNumber       = functionNode.lineNumber;
   24.82          this.flags            = flags;
   24.83 +        this.sourceURL        = sourceURL;
   24.84          this.name             = name;
   24.85          this.returnType       = returnType;
   24.86          this.compileUnit      = compileUnit;
   24.87 @@ -308,6 +320,38 @@
   24.88      }
   24.89  
   24.90      /**
   24.91 +     * get source name - sourceURL or name derived from Source.
   24.92 +     *
   24.93 +     * @return name for the script source
   24.94 +     */
   24.95 +    public String getSourceName() {
   24.96 +        return (sourceURL != null)? sourceURL : source.getName();
   24.97 +    }
   24.98 +
   24.99 +    /**
  24.100 +     * get the sourceURL
  24.101 +     * @return the sourceURL
  24.102 +     */
  24.103 +    public String getSourceURL() {
  24.104 +        return sourceURL;
  24.105 +    }
  24.106 +
  24.107 +    /**
  24.108 +     * Set the sourceURL
  24.109 +     *
  24.110 +     * @param lc lexical context
  24.111 +     * @param newSourceURL source url string to set
  24.112 +     * @return function node or a new one if state was changed
  24.113 +     */
  24.114 +    public FunctionNode setSourceURL(final LexicalContext lc, final String newSourceURL) {
  24.115 +        if (Objects.equals(sourceURL, newSourceURL)) {
  24.116 +            return this;
  24.117 +        }
  24.118 +
  24.119 +        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, newSourceURL, name, returnType, compileUnit, compilationState, body, parameters, null, hints));
  24.120 +    }
  24.121 +
  24.122 +    /**
  24.123       * Returns the line number.
  24.124       * @return the line number.
  24.125       */
  24.126 @@ -335,7 +379,7 @@
  24.127          if (this.snapshot == null) {
  24.128              return this;
  24.129          }
  24.130 -        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, name, returnType, compileUnit, compilationState, body, parameters, null, hints));
  24.131 +        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, sourceURL, name, returnType, compileUnit, compilationState, body, parameters, null, hints));
  24.132      }
  24.133  
  24.134      /**
  24.135 @@ -351,7 +395,7 @@
  24.136          if (isProgram() || parameters.isEmpty()) {
  24.137              return this; //never specialize anything that won't be recompiled
  24.138          }
  24.139 -        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, name, returnType, compileUnit, compilationState, body, parameters, this, hints));
  24.140 +        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, sourceURL, name, returnType, compileUnit, compilationState, body, parameters, this, hints));
  24.141      }
  24.142  
  24.143      /**
  24.144 @@ -409,7 +453,7 @@
  24.145          }
  24.146          final EnumSet<CompilationState> newState = EnumSet.copyOf(this.compilationState);
  24.147          newState.add(state);
  24.148 -        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, name, returnType, compileUnit, newState, body, parameters, snapshot, hints));
  24.149 +        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, sourceURL, name, returnType, compileUnit, newState, body, parameters, snapshot, hints));
  24.150      }
  24.151  
  24.152      /**
  24.153 @@ -430,7 +474,7 @@
  24.154          if (this.hints == hints) {
  24.155              return this;
  24.156          }
  24.157 -        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, name, returnType, compileUnit, compilationState, body, parameters, snapshot, hints));
  24.158 +        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, sourceURL, name, returnType, compileUnit, compilationState, body, parameters, snapshot, hints));
  24.159      }
  24.160  
  24.161      /**
  24.162 @@ -483,7 +527,7 @@
  24.163          if (this.flags == flags) {
  24.164              return this;
  24.165          }
  24.166 -        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, name, returnType, compileUnit, compilationState, body, parameters, snapshot, hints));
  24.167 +        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, sourceURL, name, returnType, compileUnit, compilationState, body, parameters, snapshot, hints));
  24.168      }
  24.169  
  24.170      @Override
  24.171 @@ -550,6 +594,15 @@
  24.172      }
  24.173  
  24.174      /**
  24.175 +     * Return {@code true} if this function makes use of the {@code this} object.
  24.176 +     *
  24.177 +     * @return true if function uses {@code this} object
  24.178 +     */
  24.179 +    public boolean usesThis() {
  24.180 +        return getFlag(USES_THIS);
  24.181 +    }
  24.182 +
  24.183 +    /**
  24.184       * Get the identifier for this function, this is its symbol.
  24.185       * @return the identifier as an IdentityNode
  24.186       */
  24.187 @@ -593,7 +646,7 @@
  24.188          if(this.body == body) {
  24.189              return this;
  24.190          }
  24.191 -        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags | (body.needsScope() ? FunctionNode.HAS_SCOPE_BLOCK : 0), name, returnType, compileUnit, compilationState, body, parameters, snapshot, hints));
  24.192 +        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags | (body.needsScope() ? FunctionNode.HAS_SCOPE_BLOCK : 0), sourceURL, name, returnType, compileUnit, compilationState, body, parameters, snapshot, hints));
  24.193      }
  24.194  
  24.195      /**
  24.196 @@ -688,7 +741,7 @@
  24.197          if (this.lastToken == lastToken) {
  24.198              return this;
  24.199          }
  24.200 -        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, name, returnType, compileUnit, compilationState, body, parameters, snapshot, hints));
  24.201 +        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, sourceURL, name, returnType, compileUnit, compilationState, body, parameters, snapshot, hints));
  24.202      }
  24.203  
  24.204      /**
  24.205 @@ -710,7 +763,7 @@
  24.206          if (this.name.equals(name)) {
  24.207              return this;
  24.208          }
  24.209 -        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, name, returnType, compileUnit, compilationState, body, parameters, snapshot, hints));
  24.210 +        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, sourceURL, name, returnType, compileUnit, compilationState, body, parameters, snapshot, hints));
  24.211      }
  24.212  
  24.213      /**
  24.214 @@ -760,7 +813,7 @@
  24.215          if (this.parameters == parameters) {
  24.216              return this;
  24.217          }
  24.218 -        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, name, returnType, compileUnit, compilationState, body, parameters, snapshot, hints));
  24.219 +        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, sourceURL, name, returnType, compileUnit, compilationState, body, parameters, snapshot, hints));
  24.220      }
  24.221  
  24.222      /**
  24.223 @@ -825,6 +878,7 @@
  24.224                  this,
  24.225                  lastToken,
  24.226                  flags,
  24.227 +                sourceURL,
  24.228                  name,
  24.229                  type,
  24.230                  compileUnit,
  24.231 @@ -863,7 +917,7 @@
  24.232          if (this.compileUnit == compileUnit) {
  24.233              return this;
  24.234          }
  24.235 -        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, name, returnType, compileUnit, compilationState, body, parameters, snapshot, hints));
  24.236 +        return Node.replaceInLexicalContext(lc, this, new FunctionNode(this, lastToken, flags, sourceURL, name, returnType, compileUnit, compilationState, body, parameters, snapshot, hints));
  24.237      }
  24.238  
  24.239      /**

    25.1 --- a/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java	Wed Mar 26 12:01:34 2014 -0700
    25.2 +++ b/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java	Tue Apr 01 11:44:05 2014 -0700
    25.3 @@ -67,12 +67,8 @@
    25.4      // initialized by nasgen
    25.5      private static PropertyMap $nasgenmap$;
    25.6  
    25.7 -    static PropertyMap getInitialMap() {
    25.8 -        return $nasgenmap$;
    25.9 -    }
   25.10 -
   25.11      AccessorPropertyDescriptor(final boolean configurable, final boolean enumerable, final Object get, final Object set, final Global global) {
   25.12 -        super(global.getObjectPrototype(), global.getAccessorPropertyDescriptorMap());
   25.13 +        super(global.getObjectPrototype(), $nasgenmap$);
   25.14          this.configurable = configurable;
   25.15          this.enumerable   = enumerable;
   25.16          this.get          = get;
   25.17 @@ -185,6 +181,18 @@
   25.18      }
   25.19  
   25.20      @Override
   25.21 +    public boolean hasAndEquals(final PropertyDescriptor otherDesc) {
   25.22 +        if (! (otherDesc instanceof AccessorPropertyDescriptor)) {
   25.23 +            return false;
   25.24 +        }
   25.25 +        final AccessorPropertyDescriptor other = (AccessorPropertyDescriptor)otherDesc;
   25.26 +        return (!has(CONFIGURABLE) || sameValue(configurable, other.configurable)) &&
   25.27 +               (!has(ENUMERABLE) || sameValue(enumerable, other.enumerable)) &&
   25.28 +               (!has(GET) || sameValue(get, other.get)) &&
   25.29 +               (!has(SET) || sameValue(set, other.set));
   25.30 +    }
   25.31 +
   25.32 +    @Override
   25.33      public boolean equals(final Object obj) {
   25.34          if (this == obj) {
   25.35              return true;

    26.1 --- a/src/jdk/nashorn/internal/objects/ArrayBufferView.java	Wed Mar 26 12:01:34 2014 -0700
    26.2 +++ b/src/jdk/nashorn/internal/objects/ArrayBufferView.java	Tue Apr 01 11:44:05 2014 -0700
    26.3 @@ -42,12 +42,8 @@
    26.4      // initialized by nasgen
    26.5      private static PropertyMap $nasgenmap$;
    26.6  
    26.7 -    static PropertyMap getInitialMap() {
    26.8 -        return $nasgenmap$;
    26.9 -    }
   26.10 -
   26.11      private ArrayBufferView(final NativeArrayBuffer buffer, final int byteOffset, final int elementLength, final Global global) {
   26.12 -        super(global.getArrayBufferViewMap());
   26.13 +        super($nasgenmap$);
   26.14          checkConstructorArgs(buffer, byteOffset, elementLength);
   26.15          this.setProto(getPrototype(global));
   26.16          this.setArray(factory().createArrayData(buffer, byteOffset, elementLength));
   26.17 @@ -386,7 +382,7 @@
   26.18          return (int) (length & Integer.MAX_VALUE);
   26.19      }
   26.20  
   26.21 -    protected static Object subarrayImpl(final Object self, final Object begin0, final Object end0) {
   26.22 +    protected static ScriptObject subarrayImpl(final Object self, final Object begin0, final Object end0) {
   26.23          final ArrayBufferView arrayView = ((ArrayBufferView)self);
   26.24          final int elementLength = arrayView.elementLength();
   26.25          final int begin = NativeArrayBuffer.adjustIndex(JSType.toInt32(begin0), elementLength);

    27.1 --- a/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java	Wed Mar 26 12:01:34 2014 -0700
    27.2 +++ b/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java	Tue Apr 01 11:44:05 2014 -0700
    27.3 @@ -64,12 +64,8 @@
    27.4      // initialized by nasgen
    27.5      private static PropertyMap $nasgenmap$;
    27.6  
    27.7 -    static PropertyMap getInitialMap() {
    27.8 -        return $nasgenmap$;
    27.9 -    }
   27.10 -
   27.11      DataPropertyDescriptor(final boolean configurable, final boolean enumerable, final boolean writable, final Object value, final Global global) {
   27.12 -        super(global.getObjectPrototype(), global.getDataPropertyDescriptorMap());
   27.13 +        super(global.getObjectPrototype(), $nasgenmap$);
   27.14          this.configurable = configurable;
   27.15          this.enumerable   = enumerable;
   27.16          this.writable     = writable;
   27.17 @@ -172,6 +168,19 @@
   27.18      }
   27.19  
   27.20      @Override
   27.21 +    public boolean hasAndEquals(final PropertyDescriptor otherDesc) {
   27.22 +        if (! (otherDesc instanceof DataPropertyDescriptor)) {
   27.23 +            return false;
   27.24 +        }
   27.25 +
   27.26 +        final DataPropertyDescriptor other = (DataPropertyDescriptor)otherDesc;
   27.27 +        return (!has(CONFIGURABLE) || sameValue(configurable, other.configurable)) &&
   27.28 +               (!has(ENUMERABLE) || sameValue(enumerable, other.enumerable)) &&
   27.29 +               (!has(WRITABLE) || sameValue(writable, other.writable)) &&
   27.30 +               (!has(VALUE) || sameValue(value, other.value));
   27.31 +    }
   27.32 +
   27.33 +    @Override
   27.34      public boolean equals(final Object obj) {
   27.35          if (this == obj) {
   27.36              return true;

    28.1 --- a/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java	Wed Mar 26 12:01:34 2014 -0700
    28.2 +++ b/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java	Tue Apr 01 11:44:05 2014 -0700
    28.3 @@ -55,12 +55,8 @@
    28.4      // initialized by nasgen
    28.5      private static PropertyMap $nasgenmap$;
    28.6  
    28.7 -    static PropertyMap getInitialMap() {
    28.8 -        return $nasgenmap$;
    28.9 -    }
   28.10 -
   28.11      GenericPropertyDescriptor(final boolean configurable, final boolean enumerable, final Global global) {
   28.12 -        super(global.getObjectPrototype(), global.getGenericPropertyDescriptorMap());
   28.13 +        super(global.getObjectPrototype(), $nasgenmap$);
   28.14          this.configurable = configurable;
   28.15          this.enumerable   = enumerable;
   28.16      }
   28.17 @@ -149,6 +145,23 @@
   28.18      }
   28.19  
   28.20      @Override
   28.21 +    public boolean hasAndEquals(final PropertyDescriptor other) {
   28.22 +        if (has(CONFIGURABLE) && other.has(CONFIGURABLE)) {
   28.23 +            if (isConfigurable() != other.isConfigurable()) {
   28.24 +                return false;
   28.25 +            }
   28.26 +        }
   28.27 +
   28.28 +        if (has(ENUMERABLE) && other.has(ENUMERABLE)) {
   28.29 +            if (isEnumerable() != other.isEnumerable()) {
   28.30 +                return false;
   28.31 +            }
   28.32 +        }
   28.33 +
   28.34 +        return true;
   28.35 +    }
   28.36 +
   28.37 +    @Override
   28.38      public boolean equals(final Object obj) {
   28.39          if (this == obj) {
   28.40              return true;

    29.1 --- a/src/jdk/nashorn/internal/objects/Global.java	Wed Mar 26 12:01:34 2014 -0700
    29.2 +++ b/src/jdk/nashorn/internal/objects/Global.java	Tue Apr 01 11:44:05 2014 -0700
    29.3 @@ -33,11 +33,8 @@
    29.4  import java.io.PrintWriter;
    29.5  import java.lang.invoke.MethodHandle;
    29.6  import java.lang.invoke.MethodHandles;
    29.7 -import java.lang.ref.ReferenceQueue;
    29.8 -import java.lang.ref.SoftReference;
    29.9  import java.lang.reflect.Field;
   29.10  import java.util.Arrays;
   29.11 -import java.util.LinkedHashMap;
   29.12  import java.util.List;
   29.13  import java.util.Map;
   29.14  import java.util.concurrent.Callable;
   29.15 @@ -51,7 +48,6 @@
   29.16  import jdk.nashorn.internal.runtime.ConsString;
   29.17  import jdk.nashorn.internal.runtime.Context;
   29.18  import jdk.nashorn.internal.runtime.GlobalFunctions;
   29.19 -import jdk.nashorn.internal.runtime.GlobalObject;
   29.20  import jdk.nashorn.internal.runtime.JSType;
   29.21  import jdk.nashorn.internal.runtime.NativeJavaPackage;
   29.22  import jdk.nashorn.internal.runtime.PropertyDescriptor;
   29.23 @@ -59,10 +55,10 @@
   29.24  import jdk.nashorn.internal.runtime.Scope;
   29.25  import jdk.nashorn.internal.runtime.ScriptEnvironment;
   29.26  import jdk.nashorn.internal.runtime.ScriptFunction;
   29.27 +import jdk.nashorn.internal.runtime.ScriptFunctionData;
   29.28  import jdk.nashorn.internal.runtime.ScriptObject;
   29.29  import jdk.nashorn.internal.runtime.ScriptRuntime;
   29.30  import jdk.nashorn.internal.runtime.ScriptingFunctions;
   29.31 -import jdk.nashorn.internal.runtime.Source;
   29.32  import jdk.nashorn.internal.runtime.arrays.ArrayData;
   29.33  import jdk.nashorn.internal.runtime.linker.Bootstrap;
   29.34  import jdk.nashorn.internal.runtime.linker.InvokeByName;
   29.35 @@ -73,7 +69,7 @@
   29.36   * Representation of global scope.
   29.37   */
   29.38  @ScriptClass("Global")
   29.39 -public final class Global extends ScriptObject implements GlobalObject, Scope {
   29.40 +public final class Global extends ScriptObject implements Scope {
   29.41      private final InvokeByName TO_STRING = new InvokeByName("toString", ScriptObject.class);
   29.42      private final InvokeByName VALUE_OF  = new InvokeByName("valueOf",  ScriptObject.class);
   29.43  
   29.44 @@ -229,6 +225,10 @@
   29.45      @Property(name = "ArrayBuffer", attributes = Attribute.NOT_ENUMERABLE)
   29.46      public volatile Object arrayBuffer;
   29.47  
   29.48 +    /** DataView object */
   29.49 +    @Property(name = "DataView", attributes = Attribute.NOT_ENUMERABLE)
   29.50 +    public volatile Object dataView;
   29.51 +
   29.52      /** TypedArray (int8) */
   29.53      @Property(name = "Int8Array", attributes = Attribute.NOT_ENUMERABLE)
   29.54      public volatile Object int8Array;
   29.55 @@ -355,6 +355,7 @@
   29.56      private ScriptObject   builtinJavaImporter;
   29.57      private ScriptObject   builtinJavaApi;
   29.58      private ScriptObject   builtinArrayBuffer;
   29.59 +    private ScriptObject   builtinDataView;
   29.60      private ScriptObject   builtinInt8Array;
   29.61      private ScriptObject   builtinUint8Array;
   29.62      private ScriptObject   builtinUint8ClampedArray;
   29.63 @@ -370,42 +371,9 @@
   29.64       */
   29.65      private ScriptFunction typeErrorThrower;
   29.66  
   29.67 -    private PropertyMap    accessorPropertyDescriptorMap;
   29.68 -    private PropertyMap    arrayBufferViewMap;
   29.69 -    private PropertyMap    dataPropertyDescriptorMap;
   29.70 -    private PropertyMap    genericPropertyDescriptorMap;
   29.71 -    private PropertyMap    nativeArgumentsMap;
   29.72 -    private PropertyMap    nativeArrayMap;
   29.73 -    private PropertyMap    nativeArrayBufferMap;
   29.74 -    private PropertyMap    nativeBooleanMap;
   29.75 -    private PropertyMap    nativeDateMap;
   29.76 -    private PropertyMap    nativeErrorMap;
   29.77 -    private PropertyMap    nativeEvalErrorMap;
   29.78 -    private PropertyMap    nativeJSAdapterMap;
   29.79 -    private PropertyMap    nativeJavaImporterMap;
   29.80 -    private PropertyMap    nativeNumberMap;
   29.81 -    private PropertyMap    nativeRangeErrorMap;
   29.82 -    private PropertyMap    nativeReferenceErrorMap;
   29.83 -    private PropertyMap    nativeRegExpMap;
   29.84 -    private PropertyMap    nativeRegExpExecResultMap;
   29.85 -    private PropertyMap    nativeStrictArgumentsMap;
   29.86 -    private PropertyMap    nativeStringMap;
   29.87 -    private PropertyMap    nativeSyntaxErrorMap;
   29.88 -    private PropertyMap    nativeTypeErrorMap;
   29.89 -    private PropertyMap    nativeURIErrorMap;
   29.90 -    private PropertyMap    prototypeObjectMap;
   29.91 -    private PropertyMap    objectMap;
   29.92 -    private PropertyMap    functionMap;
   29.93 -    private PropertyMap    anonymousFunctionMap;
   29.94 -    private PropertyMap    strictFunctionMap;
   29.95 -    private PropertyMap    boundFunctionMap;
   29.96 -
   29.97      // Flag to indicate that a split method issued a return statement
   29.98      private int splitState = -1;
   29.99  
  29.100 -    // class cache
  29.101 -    private ClassCache classCache;
  29.102 -
  29.103      // Used to store the last RegExp result to support deprecated RegExp constructor properties
  29.104      private RegExpResult lastRegExpResult;
  29.105  
  29.106 @@ -456,11 +424,6 @@
  29.107          super(checkAndGetMap(context));
  29.108          this.context = context;
  29.109          this.setIsScope();
  29.110 -
  29.111 -        final int cacheSize = context.getEnv()._class_cache_size;
  29.112 -        if (cacheSize > 0) {
  29.113 -            classCache = new ClassCache(cacheSize);
  29.114 -        }
  29.115      }
  29.116  
  29.117      /**
  29.118 @@ -469,11 +432,9 @@
  29.119       * @return the global singleton
  29.120       */
  29.121      public static Global instance() {
  29.122 -        ScriptObject global = Context.getGlobal();
  29.123 -        if (! (global instanceof Global)) {
  29.124 -            throw new IllegalStateException("no current global instance");
  29.125 -        }
  29.126 -        return (Global)global;
  29.127 +        Global global = Context.getGlobal();
  29.128 +        global.getClass(); // null check
  29.129 +        return global;
  29.130      }
  29.131  
  29.132      /**
  29.133 @@ -494,19 +455,30 @@
  29.134          return instance().getContext();
  29.135      }
  29.136  
  29.137 -    // GlobalObject interface implementation
  29.138 +    // Runtime interface to Global
  29.139  
  29.140 -    @Override
  29.141 +    /**
  29.142 +     * Is this global of the given Context?
  29.143 +     * @param ctxt the context
  29.144 +     * @return true if this global belongs to the given Context
  29.145 +     */
  29.146      public boolean isOfContext(final Context ctxt) {
  29.147          return this.context == ctxt;
  29.148      }
  29.149  
  29.150 -    @Override
  29.151 +    /**
  29.152 +     * Does this global belong to a strict Context?
  29.153 +     * @return true if this global belongs to a strict Context
  29.154 +     */
  29.155      public boolean isStrictContext() {
  29.156          return context.getEnv()._strict;
  29.157      }
  29.158  
  29.159 -    @Override
  29.160 +    /**
  29.161 +     * Initialize standard builtin objects like "Object", "Array", "Function" etc.
  29.162 +     * as well as our extension builtin objects like "Java", "JSAdapter" as properties
  29.163 +     * of the global scope object.
  29.164 +     */
  29.165      public void initBuiltinObjects() {
  29.166          if (this.builtinObject != null) {
  29.167              // already initialized, just return
  29.168 @@ -516,12 +488,26 @@
  29.169          init();
  29.170      }
  29.171  
  29.172 -    @Override
  29.173 +    /**
  29.174 +     * Create a new ScriptFunction object
  29.175 +     *
  29.176 +     * @param name   function name
  29.177 +     * @param handle invocation handle for function
  29.178 +     * @param scope  the scope
  29.179 +     * @param strict are we in strict mode
  29.180 +     *
  29.181 +     * @return new script function
  29.182 +     */
  29.183      public ScriptFunction newScriptFunction(final String name, final MethodHandle handle, final ScriptObject scope, final boolean strict) {
  29.184 -        return new ScriptFunctionImpl(name, handle, scope, null, strict, false, true);
  29.185 +        return new ScriptFunctionImpl(name, handle, scope, null, strict ? ScriptFunctionData.IS_STRICT_CONSTRUCTOR : ScriptFunctionData.IS_CONSTRUCTOR);
  29.186      }
  29.187  
  29.188 -    @Override
  29.189 +    /**
  29.190 +     * Wrap a Java object as corresponding script object
  29.191 +     *
  29.192 +     * @param obj object to wrap
  29.193 +     * @return    wrapped object
  29.194 +     */
  29.195      public Object wrapAsObject(final Object obj) {
  29.196          if (obj instanceof Boolean) {
  29.197              return new NativeBoolean((Boolean)obj, this);
  29.198 @@ -543,7 +529,14 @@
  29.199          }
  29.200      }
  29.201  
  29.202 -    @Override
  29.203 +    /**
  29.204 +     * Lookup helper for JS primitive types
  29.205 +     *
  29.206 +     * @param request the link request for the dynamic call site.
  29.207 +     * @param self     self reference
  29.208 +     *
  29.209 +     * @return guarded invocation
  29.210 +     */
  29.211      public GuardedInvocation primitiveLookup(final LinkRequest request, final Object self) {
  29.212          if (self instanceof String || self instanceof ConsString) {
  29.213              return NativeString.lookupPrimitive(request, self);
  29.214 @@ -555,12 +548,23 @@
  29.215          throw new IllegalArgumentException("Unsupported primitive: " + self);
  29.216      }
  29.217  
  29.218 -    @Override
  29.219 +    /**
  29.220 +     * Create a new empty script object
  29.221 +     *
  29.222 +     * @return the new ScriptObject
  29.223 +     */
  29.224      public ScriptObject newObject() {
  29.225 -        return new JO(getObjectPrototype(), getObjectMap());
  29.226 +        return new JO(getObjectPrototype(), JO.getInitialMap());
  29.227      }
  29.228  
  29.229 -    @Override
  29.230 +    /**
  29.231 +     * Default value of given type
  29.232 +     *
  29.233 +     * @param sobj     script object
  29.234 +     * @param typeHint type hint
  29.235 +     *
  29.236 +     * @return default value
  29.237 +     */
  29.238      public Object getDefaultValue(final ScriptObject sobj, final Class<?> typeHint) {
  29.239          // When the [[DefaultValue]] internal method of O is called with no hint,
  29.240          // then it behaves as if the hint were Number, unless O is a Date object
  29.241 @@ -620,7 +624,12 @@
  29.242          return UNDEFINED;
  29.243      }
  29.244  
  29.245 -    @Override
  29.246 +    /**
  29.247 +     * Is the given ScriptObject an ECMAScript Error object?
  29.248 +     *
  29.249 +     * @param sobj the object being checked
  29.250 +     * @return true if sobj is an Error object
  29.251 +     */
  29.252      public boolean isError(final ScriptObject sobj) {
  29.253          final ScriptObject errorProto = getErrorPrototype();
  29.254          ScriptObject proto = sobj.getProto();
  29.255 @@ -633,52 +642,108 @@
  29.256          return false;
  29.257      }
  29.258  
  29.259 -    @Override
  29.260 +    /**
  29.261 +     * Create a new ECMAScript Error object.
  29.262 +     *
  29.263 +     * @param msg error message
  29.264 +     * @return newly created Error object
  29.265 +     */
  29.266      public ScriptObject newError(final String msg) {
  29.267          return new NativeError(msg, this);
  29.268      }
  29.269  
  29.270 -    @Override
  29.271 +    /**
  29.272 +     * Create a new ECMAScript EvalError object.
  29.273 +     *
  29.274 +     * @param msg error message
  29.275 +     * @return newly created EvalError object
  29.276 +     */
  29.277      public ScriptObject newEvalError(final String msg) {
  29.278          return new NativeEvalError(msg, this);
  29.279      }
  29.280  
  29.281 -    @Override
  29.282 +    /**
  29.283 +     * Create a new ECMAScript RangeError object.
  29.284 +     *
  29.285 +     * @param msg error message
  29.286 +     * @return newly created RangeError object
  29.287 +     */
  29.288      public ScriptObject newRangeError(final String msg) {
  29.289          return new NativeRangeError(msg, this);
  29.290      }
  29.291  
  29.292 -    @Override
  29.293 +    /**
  29.294 +     * Create a new ECMAScript ReferenceError object.
  29.295 +     *
  29.296 +     * @param msg error message
  29.297 +     * @return newly created ReferenceError object
  29.298 +     */
  29.299      public ScriptObject newReferenceError(final String msg) {
  29.300          return new NativeReferenceError(msg, this);
  29.301      }
  29.302  
  29.303 -    @Override
  29.304 +    /**
  29.305 +     * Create a new ECMAScript SyntaxError object.
  29.306 +     *
  29.307 +     * @param msg error message
  29.308 +     * @return newly created SyntaxError object
  29.309 +     */
  29.310      public ScriptObject newSyntaxError(final String msg) {
  29.311          return new NativeSyntaxError(msg, this);
  29.312      }
  29.313  
  29.314 -    @Override
  29.315 +    /**
  29.316 +     * Create a new ECMAScript TypeError object.
  29.317 +     *
  29.318 +     * @param msg error message
  29.319 +     * @return newly created TypeError object
  29.320 +     */
  29.321      public ScriptObject newTypeError(final String msg) {
  29.322          return new NativeTypeError(msg, this);
  29.323      }
  29.324  
  29.325 -    @Override
  29.326 +    /**
  29.327 +     * Create a new ECMAScript URIError object.
  29.328 +     *
  29.329 +     * @param msg error message
  29.330 +     * @return newly created URIError object
  29.331 +     */
  29.332      public ScriptObject newURIError(final String msg) {
  29.333          return new NativeURIError(msg, this);
  29.334      }
  29.335  
  29.336 -    @Override
  29.337 +    /**
  29.338 +     * Create a new ECMAScript GenericDescriptor object.
  29.339 +     *
  29.340 +     * @param configurable is the property configurable?
  29.341 +     * @param enumerable is the property enumerable?
  29.342 +     * @return newly created GenericDescriptor object
  29.343 +     */
  29.344      public PropertyDescriptor newGenericDescriptor(final boolean configurable, final boolean enumerable) {
  29.345          return new GenericPropertyDescriptor(configurable, enumerable, this);
  29.346      }
  29.347  
  29.348 -    @Override
  29.349 +    /**
  29.350 +     * Create a new ECMAScript DatePropertyDescriptor object.
  29.351 +     *
  29.352 +     * @param value of the data property
  29.353 +     * @param configurable is the property configurable?
  29.354 +     * @param enumerable is the property enumerable?
  29.355 +     * @return newly created DataPropertyDescriptor object
  29.356 +     */
  29.357      public PropertyDescriptor newDataDescriptor(final Object value, final boolean configurable, final boolean enumerable, final boolean writable) {
  29.358          return new DataPropertyDescriptor(configurable, enumerable, writable, value, this);
  29.359      }
  29.360  
  29.361 -    @Override
  29.362 +    /**
  29.363 +     * Create a new ECMAScript AccessorPropertyDescriptor object.
  29.364 +     *
  29.365 +     * @param get getter function of the user accessor property
  29.366 +     * @param set setter function of the user accessor property
  29.367 +     * @param configurable is the property configurable?
  29.368 +     * @param enumerable is the property enumerable?
  29.369 +     * @return newly created AccessorPropertyDescriptor object
  29.370 +     */
  29.371      public PropertyDescriptor newAccessorDescriptor(final Object get, final Object set, final boolean configurable, final boolean enumerable) {
  29.372          final AccessorPropertyDescriptor desc = new AccessorPropertyDescriptor(configurable, enumerable, get == null ? UNDEFINED : get, set == null ? UNDEFINED : set, this);
  29.373  
  29.374 @@ -694,62 +759,6 @@
  29.375      }
  29.376  
  29.377  
  29.378 -    /**
  29.379 -     * Cache for compiled script classes.
  29.380 -     */
  29.381 -    @SuppressWarnings("serial")
  29.382 -    private static class ClassCache extends LinkedHashMap<Source, ClassReference> {
  29.383 -        private final int size;
  29.384 -        private final ReferenceQueue<Class<?>> queue;
  29.385 -
  29.386 -        ClassCache(int size) {
  29.387 -            super(size, 0.75f, true);
  29.388 -            this.size = size;
  29.389 -            this.queue = new ReferenceQueue<>();
  29.390 -        }
  29.391 -
  29.392 -        void cache(final Source source, final Class<?> clazz) {
  29.393 -            put(source, new ClassReference(clazz, queue, source));
  29.394 -        }
  29.395 -
  29.396 -        @Override
  29.397 -        protected boolean removeEldestEntry(final Map.Entry<Source, ClassReference> eldest) {
  29.398 -            return size() > size;
  29.399 -        }
  29.400 -
  29.401 -        @Override
  29.402 -        public ClassReference get(Object key) {
  29.403 -            for (ClassReference ref; (ref = (ClassReference)queue.poll()) != null; ) {
  29.404 -                remove(ref.source);
  29.405 -            }
  29.406 -            return super.get(key);
  29.407 -        }
  29.408 -
  29.409 -    }
  29.410 -
  29.411 -    private static class ClassReference extends SoftReference<Class<?>> {
  29.412 -        private final Source source;
  29.413 -
  29.414 -        ClassReference(final Class<?> clazz, final ReferenceQueue<Class<?>> queue, final Source source) {
  29.415 -            super(clazz, queue);
  29.416 -            this.source = source;
  29.417 -        }
  29.418 -    }
  29.419 -
  29.420 -    // Class cache management
  29.421 -    @Override
  29.422 -    public Class<?> findCachedClass(final Source source) {
  29.423 -        assert classCache != null : "Class cache used without being initialized";
  29.424 -        ClassReference ref = classCache.get(source);
  29.425 -        return ref != null ? ref.get() : null;
  29.426 -    }
  29.427 -
  29.428 -    @Override
  29.429 -    public void cacheClass(final Source source, final Class<?> clazz) {
  29.430 -        assert classCache != null : "Class cache used without being initialized";
  29.431 -        classCache.cache(source, clazz);
  29.432 -    }
  29.433 -
  29.434      private static <T> T getLazilyCreatedValue(final Object key, final Callable<T> creator, final Map<Object, T> map) {
  29.435          final T obj = map.get(key);
  29.436          if (obj != null) {
  29.437 @@ -767,14 +776,25 @@
  29.438  
  29.439      private final Map<Object, InvokeByName> namedInvokers = new ConcurrentHashMap<>();
  29.440  
  29.441 -    @Override
  29.442 +
  29.443 +    /**
  29.444 +     * Get cached InvokeByName object for the given key
  29.445 +     * @param key key to be associated with InvokeByName object
  29.446 +     * @param creator if InvokeByName is absent 'creator' is called to make one (lazy init)
  29.447 +     * @return InvokeByName object associated with the key.
  29.448 +     */
  29.449      public InvokeByName getInvokeByName(final Object key, final Callable<InvokeByName> creator) {
  29.450          return getLazilyCreatedValue(key, creator, namedInvokers);
  29.451      }
  29.452  
  29.453      private final Map<Object, MethodHandle> dynamicInvokers = new ConcurrentHashMap<>();
  29.454  
  29.455 -    @Override
  29.456 +    /**
  29.457 +     * Get cached dynamic method handle for the given key
  29.458 +     * @param key key to be associated with dynamic method handle
  29.459 +     * @param creator if method handle is absent 'creator' is called to make one (lazy init)
  29.460 +     * @return dynamic method handle associated with the key.
  29.461 +     */
  29.462      public MethodHandle getDynamicInvoker(final Object key, final Callable<MethodHandle> creator) {
  29.463          return getLazilyCreatedValue(key, creator, dynamicInvokers);
  29.464      }
  29.465 @@ -963,6 +983,10 @@
  29.466          return ScriptFunction.getPrototype(builtinArrayBuffer);
  29.467      }
  29.468  
  29.469 +    ScriptObject getDataViewPrototype() {
  29.470 +        return ScriptFunction.getPrototype(builtinDataView);
  29.471 +    }
  29.472 +
  29.473      ScriptObject getInt8ArrayPrototype() {
  29.474          return ScriptFunction.getPrototype(builtinInt8Array);
  29.475      }
  29.476 @@ -999,123 +1023,6 @@
  29.477          return ScriptFunction.getPrototype(builtinFloat64Array);
  29.478      }
  29.479  
  29.480 -    // Builtin PropertyMap accessors
  29.481 -    PropertyMap getAccessorPropertyDescriptorMap() {
  29.482 -        return accessorPropertyDescriptorMap;
  29.483 -    }
  29.484 -
  29.485 -    PropertyMap getArrayBufferViewMap() {
  29.486 -        return arrayBufferViewMap;
  29.487 -    }
  29.488 -
  29.489 -    PropertyMap getDataPropertyDescriptorMap() {
  29.490 -        return dataPropertyDescriptorMap;
  29.491 -    }
  29.492 -
  29.493 -    PropertyMap getGenericPropertyDescriptorMap() {
  29.494 -        return genericPropertyDescriptorMap;
  29.495 -    }
  29.496 -
  29.497 -    PropertyMap getArgumentsMap() {
  29.498 -        return nativeArgumentsMap;
  29.499 -    }
  29.500 -
  29.501 -    PropertyMap getArrayMap() {
  29.502 -        return nativeArrayMap;
  29.503 -    }
  29.504 -
  29.505 -    PropertyMap getArrayBufferMap() {
  29.506 -        return nativeArrayBufferMap;
  29.507 -    }
  29.508 -
  29.509 -    PropertyMap getBooleanMap() {
  29.510 -        return nativeBooleanMap;
  29.511 -    }
  29.512 -
  29.513 -    PropertyMap getDateMap() {
  29.514 -        return nativeDateMap;
  29.515 -    }
  29.516 -
  29.517 -    PropertyMap getErrorMap() {
  29.518 -        return nativeErrorMap;
  29.519 -    }
  29.520 -
  29.521 -    PropertyMap getEvalErrorMap() {
  29.522 -        return nativeEvalErrorMap;
  29.523 -    }
  29.524 -
  29.525 -    PropertyMap getJSAdapterMap() {
  29.526 -        return nativeJSAdapterMap;
  29.527 -    }
  29.528 -
  29.529 -    PropertyMap getJavaImporterMap() {
  29.530 -        return nativeJavaImporterMap;
  29.531 -    }
  29.532 -
  29.533 -    PropertyMap getNumberMap() {
  29.534 -        return nativeNumberMap;
  29.535 -    }
  29.536 -
  29.537 -    PropertyMap getRangeErrorMap() {
  29.538 -        return nativeRangeErrorMap;
  29.539 -    }
  29.540 -
  29.541 -    PropertyMap getReferenceErrorMap() {
  29.542 -        return nativeReferenceErrorMap;
  29.543 -    }
  29.544 -
  29.545 -    PropertyMap getRegExpMap() {
  29.546 -        return nativeRegExpMap;
  29.547 -    }
  29.548 -
  29.549 -    PropertyMap getRegExpExecResultMap() {
  29.550 -        return nativeRegExpExecResultMap;
  29.551 -    }
  29.552 -
  29.553 -    PropertyMap getStrictArgumentsMap() {
  29.554 -        return nativeStrictArgumentsMap;
  29.555 -    }
  29.556 -
  29.557 -    PropertyMap getStringMap() {
  29.558 -        return nativeStringMap;
  29.559 -    }
  29.560 -
  29.561 -    PropertyMap getSyntaxErrorMap() {
  29.562 -        return nativeSyntaxErrorMap;
  29.563 -    }
  29.564 -
  29.565 -    PropertyMap getTypeErrorMap() {
  29.566 -        return nativeTypeErrorMap;
  29.567 -    }
  29.568 -
  29.569 -    PropertyMap getURIErrorMap() {
  29.570 -        return nativeURIErrorMap;
  29.571 -    }
  29.572 -
  29.573 -    PropertyMap getPrototypeObjectMap() {
  29.574 -        return prototypeObjectMap;
  29.575 -    }
  29.576 -
  29.577 -    PropertyMap getObjectMap() {
  29.578 -        return objectMap;
  29.579 -    }
  29.580 -
  29.581 -    PropertyMap getFunctionMap() {
  29.582 -        return functionMap;
  29.583 -    }
  29.584 -
  29.585 -    PropertyMap getAnonymousFunctionMap() {
  29.586 -        return anonymousFunctionMap;
  29.587 -    }
  29.588 -
  29.589 -    PropertyMap getStrictFunctionMap() {
  29.590 -        return strictFunctionMap;
  29.591 -    }
  29.592 -
  29.593 -    PropertyMap getBoundFunctionMap() {
  29.594 -        return boundFunctionMap;
  29.595 -    }
  29.596 -
  29.597      private ScriptFunction getBuiltinArray() {
  29.598          return builtinArray;
  29.599      }
  29.600 @@ -1631,14 +1538,11 @@
  29.601  
  29.602          final ScriptEnvironment env = getContext().getEnv();
  29.603  
  29.604 -        // duplicate PropertyMaps of Native* classes
  29.605 -        copyInitialMaps(env);
  29.606 -
  29.607          // initialize Function and Object constructor
  29.608          initFunctionAndObject();
  29.609  
  29.610          // Now fix Global's own proto.
  29.611 -        this.setProto(getObjectPrototype());
  29.612 +        this.setInitialProto(getObjectPrototype());
  29.613  
  29.614          // initialize global function properties
  29.615          this.eval = this.builtinEval = ScriptFunctionImpl.makeFunction("eval", EVAL);
  29.616 @@ -1705,8 +1609,25 @@
  29.617              initScripting(env);
  29.618          }
  29.619  
  29.620 -        if (Context.DEBUG && System.getSecurityManager() == null) {
  29.621 -            initDebug();
  29.622 +        if (Context.DEBUG) {
  29.623 +            boolean debugOkay;
  29.624 +            final SecurityManager sm = System.getSecurityManager();
  29.625 +            if (sm != null) {
  29.626 +                try {
  29.627 +                    sm.checkPermission(new RuntimePermission(Context.NASHORN_DEBUG_MODE));
  29.628 +                    debugOkay = true;
  29.629 +                } catch (final SecurityException ignored) {
  29.630 +                    // if no permission, don't initialize Debug object
  29.631 +                    debugOkay = false;
  29.632 +                }
  29.633 +
  29.634 +            } else {
  29.635 +                debugOkay = true;
  29.636 +            }
  29.637 +
  29.638 +            if (debugOkay) {
  29.639 +                initDebug();
  29.640 +            }
  29.641          }
  29.642  
  29.643          copyBuiltins();
  29.644 @@ -1766,7 +1687,7 @@
  29.645          final ScriptObject prototype = ScriptFunction.getPrototype(cons);
  29.646          prototype.set(NativeError.NAME, name, false);
  29.647          prototype.set(NativeError.MESSAGE, "", false);
  29.648 -        prototype.setProto(errorProto);
  29.649 +        prototype.setInitialProto(errorProto);
  29.650          return (ScriptFunction)cons;
  29.651      }
  29.652  
  29.653 @@ -1834,6 +1755,7 @@
  29.654  
  29.655      private void initTypedArray() {
  29.656          this.builtinArrayBuffer       = initConstructor("ArrayBuffer");
  29.657 +        this.builtinDataView          = initConstructor("DataView");
  29.658          this.builtinInt8Array         = initConstructor("Int8Array");
  29.659          this.builtinUint8Array        = initConstructor("Uint8Array");
  29.660          this.builtinUint8ClampedArray = initConstructor("Uint8ClampedArray");
  29.661 @@ -1874,6 +1796,7 @@
  29.662          this.typeError         = this.builtinTypeError;
  29.663          this.uriError          = this.builtinURIError;
  29.664          this.arrayBuffer       = this.builtinArrayBuffer;
  29.665 +        this.dataView          = this.builtinDataView;
  29.666          this.int8Array         = this.builtinInt8Array;
  29.667          this.uint8Array        = this.builtinUint8Array;
  29.668          this.uint8ClampedArray = this.builtinUint8ClampedArray;
  29.669 @@ -1938,7 +1861,7 @@
  29.670              }
  29.671  
  29.672              if (res.getProto() == null) {
  29.673 -                res.setProto(getObjectPrototype());
  29.674 +                res.setInitialProto(getObjectPrototype());
  29.675              }
  29.676  
  29.677              return res;
  29.678 @@ -1948,46 +1871,6 @@
  29.679          }
  29.680      }
  29.681  
  29.682 -    private void copyInitialMaps(final ScriptEnvironment env) {
  29.683 -        this.accessorPropertyDescriptorMap = AccessorPropertyDescriptor.getInitialMap().duplicate();
  29.684 -        this.dataPropertyDescriptorMap = DataPropertyDescriptor.getInitialMap().duplicate();
  29.685 -        this.genericPropertyDescriptorMap = GenericPropertyDescriptor.getInitialMap().duplicate();
  29.686 -        this.nativeArgumentsMap = NativeArguments.getInitialMap().duplicate();
  29.687 -        this.nativeArrayMap = NativeArray.getInitialMap().duplicate();
  29.688 -        this.nativeBooleanMap = NativeBoolean.getInitialMap().duplicate();
  29.689 -        this.nativeDateMap = NativeDate.getInitialMap().duplicate();
  29.690 -        this.nativeErrorMap = NativeError.getInitialMap().duplicate();
  29.691 -        this.nativeEvalErrorMap = NativeEvalError.getInitialMap().duplicate();
  29.692 -        this.nativeJSAdapterMap = NativeJSAdapter.getInitialMap().duplicate();
  29.693 -        this.nativeNumberMap = NativeNumber.getInitialMap().duplicate();
  29.694 -        this.nativeRangeErrorMap = NativeRangeError.getInitialMap().duplicate();
  29.695 -        this.nativeReferenceErrorMap = NativeReferenceError.getInitialMap().duplicate();
  29.696 -        this.nativeRegExpMap = NativeRegExp.getInitialMap().duplicate();
  29.697 -        this.nativeRegExpExecResultMap = NativeRegExpExecResult.getInitialMap().duplicate();
  29.698 -        this.nativeStrictArgumentsMap = NativeStrictArguments.getInitialMap().duplicate();
  29.699 -        this.nativeStringMap = NativeString.getInitialMap().duplicate();
  29.700 -        this.nativeSyntaxErrorMap = NativeSyntaxError.getInitialMap().duplicate();
  29.701 -        this.nativeTypeErrorMap = NativeTypeError.getInitialMap().duplicate();
  29.702 -        this.nativeURIErrorMap = NativeURIError.getInitialMap().duplicate();
  29.703 -        this.prototypeObjectMap = PrototypeObject.getInitialMap().duplicate();
  29.704 -        this.objectMap = JO.getInitialMap().duplicate();
  29.705 -        this.functionMap = ScriptFunctionImpl.getInitialMap().duplicate();
  29.706 -        this.anonymousFunctionMap = ScriptFunctionImpl.getInitialAnonymousMap().duplicate();
  29.707 -        this.strictFunctionMap = ScriptFunctionImpl.getInitialStrictMap().duplicate();
  29.708 -        this.boundFunctionMap = ScriptFunctionImpl.getInitialBoundMap().duplicate();
  29.709 -
  29.710 -        // java
  29.711 -        if (! env._no_java) {
  29.712 -            this.nativeJavaImporterMap = NativeJavaImporter.getInitialMap().duplicate();
  29.713 -        }
  29.714 -
  29.715 -        // typed arrays
  29.716 -        if (! env._no_typed_arrays) {
  29.717 -            this.arrayBufferViewMap = ArrayBufferView.getInitialMap().duplicate();
  29.718 -            this.nativeArrayBufferMap = NativeArrayBuffer.getInitialMap().duplicate();
  29.719 -        }
  29.720 -    }
  29.721 -
  29.722      // Function and Object constructors are inter-dependent. Also,
  29.723      // Function.prototype
  29.724      // functions are not properly initialized. We fix the references here.
  29.725 @@ -2005,13 +1888,13 @@
  29.726  
  29.727          // Function.prototype === Object.getPrototypeOf(Function) ===
  29.728          // <anon-function>
  29.729 -        builtinFunction.setProto(anon);
  29.730 +        builtinFunction.setInitialProto(anon);
  29.731          builtinFunction.setPrototype(anon);
  29.732          anon.set("constructor", builtinFunction, false);
  29.733          anon.deleteOwnProperty(anon.getMap().findProperty("prototype"));
  29.734  
  29.735          // use "getter" so that [[ThrowTypeError]] function's arity is 0 - as specified in step 10 of section 13.2.3
  29.736 -        this.typeErrorThrower = new ScriptFunctionImpl("TypeErrorThrower", Lookup.TYPE_ERROR_THROWER_GETTER, null, null, false, false, false);
  29.737 +        this.typeErrorThrower = new ScriptFunctionImpl("TypeErrorThrower", Lookup.TYPE_ERROR_THROWER_GETTER, null, null, 0);
  29.738          typeErrorThrower.setPrototype(UNDEFINED);
  29.739          // Non-constructor built-in functions do not have "prototype" property
  29.740          typeErrorThrower.deleteOwnProperty(typeErrorThrower.getMap().findProperty("prototype"));
  29.741 @@ -2021,7 +1904,7 @@
  29.742          this.builtinObject = (ScriptFunction)initConstructor("Object");
  29.743          final ScriptObject ObjectPrototype = getObjectPrototype();
  29.744          // Object.getPrototypeOf(Function.prototype) === Object.prototype
  29.745 -        anon.setProto(ObjectPrototype);
  29.746 +        anon.setInitialProto(ObjectPrototype);
  29.747  
  29.748          // Function valued properties of Function.prototype were not properly
  29.749          // initialized. Because, these were created before global.function and
  29.750 @@ -2033,10 +1916,10 @@
  29.751  
  29.752              if (value instanceof ScriptFunction && value != anon) {
  29.753                  final ScriptFunction func = (ScriptFunction)value;
  29.754 -                func.setProto(getFunctionPrototype());
  29.755 +                func.setInitialProto(getFunctionPrototype());
  29.756                  final ScriptObject prototype = ScriptFunction.getPrototype(func);
  29.757                  if (prototype != null) {
  29.758 -                    prototype.setProto(ObjectPrototype);
  29.759 +                    prototype.setInitialProto(ObjectPrototype);
  29.760                  }
  29.761              }
  29.762          }
  29.763 @@ -2051,7 +1934,7 @@
  29.764                  final ScriptFunction func = (ScriptFunction)value;
  29.765                  final ScriptObject prototype = ScriptFunction.getPrototype(func);
  29.766                  if (prototype != null) {
  29.767 -                    prototype.setProto(ObjectPrototype);
  29.768 +                    prototype.setInitialProto(ObjectPrototype);
  29.769                  }
  29.770              }
  29.771          }
  29.772 @@ -2069,7 +1952,7 @@
  29.773                  final ScriptFunction func = (ScriptFunction)value;
  29.774                  final ScriptObject prototype = ScriptFunction.getPrototype(func);
  29.775                  if (prototype != null) {
  29.776 -                    prototype.setProto(ObjectPrototype);
  29.777 +                    prototype.setInitialProto(ObjectPrototype);
  29.778                  }
  29.779              }
  29.780          }

    30.1 --- a/src/jdk/nashorn/internal/objects/NativeArguments.java	Wed Mar 26 12:01:34 2014 -0700
    30.2 +++ b/src/jdk/nashorn/internal/objects/NativeArguments.java	Tue Apr 01 11:44:05 2014 -0700
    30.3 @@ -68,7 +68,7 @@
    30.4          final ArrayList<Property> properties = new ArrayList<>(2);
    30.5          properties.add(AccessorProperty.create("length", Property.NOT_ENUMERABLE, G$LENGTH, S$LENGTH));
    30.6          properties.add(AccessorProperty.create("callee", Property.NOT_ENUMERABLE, G$CALLEE, S$CALLEE));
    30.7 -        map$ = PropertyMap.newMap(properties).setIsShared();
    30.8 +        map$ = PropertyMap.newMap(properties);
    30.9      }
   30.10  
   30.11      static PropertyMap getInitialMap() {
   30.12 @@ -267,9 +267,9 @@
   30.13          final Global global = Global.instance();
   30.14          final ScriptObject proto = global.getObjectPrototype();
   30.15          if (isStrict) {
   30.16 -            return new NativeStrictArguments(arguments, numParams, proto, global.getStrictArgumentsMap());
   30.17 +            return new NativeStrictArguments(arguments, numParams, proto, NativeStrictArguments.getInitialMap());
   30.18          }
   30.19 -        return new NativeArguments(arguments, callee, numParams, proto, global.getArgumentsMap());
   30.20 +        return new NativeArguments(arguments, callee, numParams, proto, NativeArguments.getInitialMap());
   30.21      }
   30.22  
   30.23      /**

    31.1 --- a/src/jdk/nashorn/internal/objects/NativeArray.java	Wed Mar 26 12:01:34 2014 -0700
    31.2 +++ b/src/jdk/nashorn/internal/objects/NativeArray.java	Tue Apr 01 11:44:05 2014 -0700
    31.3 @@ -31,6 +31,7 @@
    31.4  import static jdk.nashorn.internal.runtime.PropertyDescriptor.WRITABLE;
    31.5  import static jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator.arrayLikeIterator;
    31.6  import static jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator.reverseArrayLikeIterator;
    31.7 +import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.isValidArrayIndex;
    31.8  
    31.9  import java.lang.invoke.MethodHandle;
   31.10  import java.util.ArrayList;
   31.11 @@ -156,10 +157,6 @@
   31.12      // initialized by nasgen
   31.13      private static PropertyMap $nasgenmap$;
   31.14  
   31.15 -    static PropertyMap getInitialMap() {
   31.16 -        return $nasgenmap$;
   31.17 -    }
   31.18 -
   31.19      /*
   31.20       * Constructors.
   31.21       */
   31.22 @@ -208,7 +205,7 @@
   31.23      }
   31.24  
   31.25      NativeArray(final ArrayData arrayData, final Global global) {
   31.26 -        super(global.getArrayPrototype(), global.getArrayMap());
   31.27 +        super(global.getArrayPrototype(), $nasgenmap$);
   31.28          this.setArray(arrayData);
   31.29          this.setIsArray();
   31.30      }
   31.31 @@ -354,6 +351,27 @@
   31.32      }
   31.33  
   31.34      /**
   31.35 +     * Spec. mentions use of [[DefineOwnProperty]] for indexed properties in
   31.36 +     * certain places (eg. Array.prototype.map, filter). We can not use ScriptObject.set
   31.37 +     * method in such cases. This is because set method uses inherited setters (if any)
   31.38 +     * from any object in proto chain such as Array.prototype, Object.prototype.
   31.39 +     * This method directly sets a particular element value in the current object.
   31.40 +     *
   31.41 +     * @param index key for property
   31.42 +     * @param value value to define
   31.43 +     */
   31.44 +    @Override
   31.45 +    public final void defineOwnProperty(final int index, final Object value) {
   31.46 +        assert isValidArrayIndex(index) : "invalid array index";
   31.47 +        final long longIndex = ArrayIndex.toLongIndex(index);
   31.48 +        if (longIndex >= getArray().length()) {
   31.49 +            // make array big enough to hold..
   31.50 +            setArray(getArray().ensure(longIndex));
   31.51 +        }
   31.52 +        setArray(getArray().set(index, value, false));
   31.53 +    }
   31.54 +
   31.55 +    /**
   31.56       * Return the array contents upcasted as an ObjectArray, regardless of
   31.57       * representation
   31.58       *
   31.59 @@ -371,7 +389,7 @@
   31.60       * @return true if argument is an array
   31.61       */
   31.62      @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
   31.63 -    public static Object isArray(final Object self, final Object arg) {
   31.64 +    public static boolean isArray(final Object self, final Object arg) {
   31.65          return isArray(arg) || (arg instanceof JSObject && ((JSObject)arg).isArray());
   31.66      }
   31.67  
   31.68 @@ -470,7 +488,7 @@
   31.69       * @return locale specific string representation for array
   31.70       */
   31.71      @Function(attributes = Attribute.NOT_ENUMERABLE)
   31.72 -    public static Object toLocaleString(final Object self) {
   31.73 +    public static String toLocaleString(final Object self) {
   31.74          final StringBuilder sb = new StringBuilder();
   31.75          final Iterator<Object> iter = arrayLikeIterator(self, true);
   31.76  
   31.77 @@ -516,7 +534,7 @@
   31.78       * @return the new NativeArray
   31.79       */
   31.80      @Constructor(arity = 1)
   31.81 -    public static Object construct(final boolean newObj, final Object self, final Object... args) {
   31.82 +    public static NativeArray construct(final boolean newObj, final Object self, final Object... args) {
   31.83          switch (args.length) {
   31.84          case 0:
   31.85              return new NativeArray(0);
   31.86 @@ -569,7 +587,7 @@
   31.87       * @return the new NativeArray
   31.88       */
   31.89      @SpecializedConstructor
   31.90 -    public static Object construct(final boolean newObj, final Object self) {
   31.91 +    public static NativeArray construct(final boolean newObj, final Object self) {
   31.92          return new NativeArray(0);
   31.93      }
   31.94  
   31.95 @@ -584,7 +602,7 @@
   31.96       * @return the new NativeArray
   31.97       */
   31.98      @SpecializedConstructor
   31.99 -    public static Object construct(final boolean newObj, final Object self, final int length) {
  31.100 +    public static NativeArray construct(final boolean newObj, final Object self, final int length) {
  31.101          if (length >= 0) {
  31.102              return new NativeArray(length);
  31.103          }
  31.104 @@ -603,7 +621,7 @@
  31.105       * @return the new NativeArray
  31.106       */
  31.107      @SpecializedConstructor
  31.108 -    public static Object construct(final boolean newObj, final Object self, final long length) {
  31.109 +    public static NativeArray construct(final boolean newObj, final Object self, final long length) {
  31.110          if (length >= 0L && length <= JSType.MAX_UINT) {
  31.111              return new NativeArray(length);
  31.112          }
  31.113 @@ -622,7 +640,7 @@
  31.114       * @return the new NativeArray
  31.115       */
  31.116      @SpecializedConstructor
  31.117 -    public static Object construct(final boolean newObj, final Object self, final double length) {
  31.118 +    public static NativeArray construct(final boolean newObj, final Object self, final double length) {
  31.119          final long uint32length = JSType.toUint32(length);
  31.120  
  31.121          if (uint32length == length) {
  31.122 @@ -640,7 +658,7 @@
  31.123       * @return resulting NativeArray
  31.124       */
  31.125      @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
  31.126 -    public static Object concat(final Object self, final Object... args) {
  31.127 +    public static NativeArray concat(final Object self, final Object... args) {
  31.128          final ArrayList<Object> list = new ArrayList<>();
  31.129          concatToList(list, Global.toObject(self));
  31.130  
  31.131 @@ -687,7 +705,7 @@
  31.132       * @return string representation after join
  31.133       */
  31.134      @Function(attributes = Attribute.NOT_ENUMERABLE)
  31.135 -    public static Object join(final Object self, final Object separator) {
  31.136 +    public static String join(final Object self, final Object separator) {
  31.137          final StringBuilder    sb   = new StringBuilder();
  31.138          final Iterator<Object> iter = arrayLikeIterator(self, true);
  31.139          final String           sep  = separator == ScriptRuntime.UNDEFINED ? "," : JSType.toString(separator);
  31.140 @@ -955,7 +973,7 @@
  31.141       * @return sorted array
  31.142       */
  31.143      @Function(attributes = Attribute.NOT_ENUMERABLE)
  31.144 -    public static Object sort(final Object self, final Object comparefn) {
  31.145 +    public static ScriptObject sort(final Object self, final Object comparefn) {
  31.146          try {
  31.147              final ScriptObject sobj    = (ScriptObject) self;
  31.148              final long         len     = JSType.toUint32(sobj.getLength());
  31.149 @@ -1159,7 +1177,7 @@
  31.150       * @return index of element, or -1 if not found
  31.151       */
  31.152      @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
  31.153 -    public static Object indexOf(final Object self, final Object searchElement, final Object fromIndex) {
  31.154 +    public static long indexOf(final Object self, final Object searchElement, final Object fromIndex) {
  31.155          try {
  31.156              final ScriptObject sobj = (ScriptObject)Global.toObject(self);
  31.157              final long         len  = JSType.toUint32(sobj.getLength());
  31.158 @@ -1195,7 +1213,7 @@
  31.159       * @return index of element, or -1 if not found
  31.160       */
  31.161      @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
  31.162 -    public static Object lastIndexOf(final Object self, final Object... args) {
  31.163 +    public static long lastIndexOf(final Object self, final Object... args) {
  31.164          try {
  31.165              final ScriptObject sobj = (ScriptObject)Global.toObject(self);
  31.166              final long         len  = JSType.toUint32(sobj.getLength());
  31.167 @@ -1230,7 +1248,7 @@
  31.168       * @return true if callback function return true for every element in the array, false otherwise
  31.169       */
  31.170      @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
  31.171 -    public static Object every(final Object self, final Object callbackfn, final Object thisArg) {
  31.172 +    public static boolean every(final Object self, final Object callbackfn, final Object thisArg) {
  31.173          return applyEvery(Global.toObject(self), callbackfn, thisArg);
  31.174      }
  31.175  
  31.176 @@ -1254,7 +1272,7 @@
  31.177       * @return true if callback function returned true for any element in the array, false otherwise
  31.178       */
  31.179      @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
  31.180 -    public static Object some(final Object self, final Object callbackfn, final Object thisArg) {
  31.181 +    public static boolean some(final Object self, final Object callbackfn, final Object thisArg) {
  31.182          return new IteratorAction<Boolean>(Global.toObject(self), callbackfn, thisArg, false) {
  31.183              private final MethodHandle someInvoker = getSOME_CALLBACK_INVOKER();
  31.184  
  31.185 @@ -1295,7 +1313,7 @@
  31.186       * @return array with elements transformed by map function
  31.187       */
  31.188      @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
  31.189 -    public static Object map(final Object self, final Object callbackfn, final Object thisArg) {
  31.190 +    public static NativeArray map(final Object self, final Object callbackfn, final Object thisArg) {
  31.191          return new IteratorAction<NativeArray>(Global.toObject(self), callbackfn, thisArg, null) {
  31.192              private final MethodHandle mapInvoker = getMAP_CALLBACK_INVOKER();
  31.193  
  31.194 @@ -1324,7 +1342,7 @@
  31.195       * @return filtered array
  31.196       */
  31.197      @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
  31.198 -    public static Object filter(final Object self, final Object callbackfn, final Object thisArg) {
  31.199 +    public static NativeArray filter(final Object self, final Object callbackfn, final Object thisArg) {
  31.200          return new IteratorAction<NativeArray>(Global.toObject(self), callbackfn, thisArg, new NativeArray()) {
  31.201              private long to = 0;
  31.202              private final MethodHandle filterInvoker = getFILTER_CALLBACK_INVOKER();

    32.1 --- a/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java	Wed Mar 26 12:01:34 2014 -0700
    32.2 +++ b/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java	Tue Apr 01 11:44:05 2014 -0700
    32.3 @@ -25,6 +25,7 @@
    32.4  
    32.5  package jdk.nashorn.internal.objects;
    32.6  
    32.7 +import java.nio.ByteBuffer;
    32.8  import java.util.Arrays;
    32.9  import jdk.nashorn.internal.objects.annotations.Attribute;
   32.10  import jdk.nashorn.internal.objects.annotations.Constructor;
   32.11 @@ -43,12 +44,8 @@
   32.12      // initialized by nasgen
   32.13      private static PropertyMap $nasgenmap$;
   32.14  
   32.15 -    static PropertyMap getInitialMap() {
   32.16 -        return $nasgenmap$;
   32.17 -    }
   32.18 -
   32.19      @Constructor(arity = 1)
   32.20 -    public static Object constructor(final boolean newObj, final Object self, final Object... args) {
   32.21 +    public static NativeArrayBuffer constructor(final boolean newObj, final Object self, final Object... args) {
   32.22          if (args.length == 0) {
   32.23              throw new RuntimeException("missing length argument");
   32.24          }
   32.25 @@ -57,7 +54,7 @@
   32.26      }
   32.27  
   32.28      protected NativeArrayBuffer(final byte[] byteArray, final Global global) {
   32.29 -        super(global.getArrayBufferPrototype(), global.getArrayBufferMap());
   32.30 +        super(global.getArrayBufferPrototype(), $nasgenmap$);
   32.31          this.buffer = byteArray;
   32.32      }
   32.33  
   32.34 @@ -84,7 +81,7 @@
   32.35      }
   32.36  
   32.37      @Function(attributes = Attribute.NOT_ENUMERABLE)
   32.38 -    public static Object slice(final Object self, final Object begin0, final Object end0) {
   32.39 +    public static NativeArrayBuffer slice(final Object self, final Object begin0, final Object end0) {
   32.40          final NativeArrayBuffer arrayBuffer = (NativeArrayBuffer)self;
   32.41          int begin = JSType.toInt32(begin0);
   32.42          int end = end0 != ScriptRuntime.UNDEFINED ? JSType.toInt32(end0) : arrayBuffer.getByteLength();
   32.43 @@ -128,4 +125,16 @@
   32.44      public int getByteLength() {
   32.45          return buffer.length;
   32.46      }
   32.47 +
   32.48 +    ByteBuffer getBuffer() {
   32.49 +       return ByteBuffer.wrap(buffer);
   32.50 +    }
   32.51 +
   32.52 +    ByteBuffer getBuffer(final int offset) {
   32.53 +        return ByteBuffer.wrap(buffer, offset, buffer.length - offset);
   32.54 +    }
   32.55 +
   32.56 +    ByteBuffer getBuffer(final int offset, final int length) {
   32.57 +        return ByteBuffer.wrap(buffer, offset, length);
   32.58 +    }
   32.59  }

    33.1 --- a/src/jdk/nashorn/internal/objects/NativeBoolean.java	Wed Mar 26 12:01:34 2014 -0700
    33.2 +++ b/src/jdk/nashorn/internal/objects/NativeBoolean.java	Tue Apr 01 11:44:05 2014 -0700
    33.3 @@ -30,6 +30,7 @@
    33.4  
    33.5  import java.lang.invoke.MethodHandle;
    33.6  import java.lang.invoke.MethodHandles;
    33.7 +import java.lang.invoke.MethodType;
    33.8  import jdk.internal.dynalink.linker.GuardedInvocation;
    33.9  import jdk.internal.dynalink.linker.LinkRequest;
   33.10  import jdk.nashorn.internal.objects.annotations.Attribute;
   33.11 @@ -50,22 +51,21 @@
   33.12  public final class NativeBoolean extends ScriptObject {
   33.13      private final boolean value;
   33.14  
   33.15 -    final static MethodHandle WRAPFILTER = findWrapFilter();
   33.16 +    // Method handle to create an object wrapper for a primitive boolean
   33.17 +    private static final MethodHandle WRAPFILTER = findOwnMH("wrapFilter", MH.type(NativeBoolean.class, Object.class));
   33.18 +    // Method handle to retrieve the Boolean prototype object
   33.19 +    private static final MethodHandle PROTOFILTER = findOwnMH("protoFilter", MH.type(Object.class, Object.class));
   33.20  
   33.21      // initialized by nasgen
   33.22      private static PropertyMap $nasgenmap$;
   33.23  
   33.24 -    static PropertyMap getInitialMap() {
   33.25 -        return $nasgenmap$;
   33.26 -    }
   33.27 -
   33.28      private NativeBoolean(final boolean value, final ScriptObject proto, final PropertyMap map) {
   33.29          super(proto, map);
   33.30          this.value = value;
   33.31      }
   33.32  
   33.33      NativeBoolean(final boolean flag, final Global global) {
   33.34 -        this(flag, global.getBooleanPrototype(), global.getBooleanMap());
   33.35 +        this(flag, global.getBooleanPrototype(), $nasgenmap$);
   33.36      }
   33.37  
   33.38      NativeBoolean(final boolean flag) {
   33.39 @@ -110,7 +110,7 @@
   33.40       * @return string representation of this boolean
   33.41       */
   33.42      @Function(attributes = Attribute.NOT_ENUMERABLE)
   33.43 -    public static Object toString(final Object self) {
   33.44 +    public static String toString(final Object self) {
   33.45          return getBoolean(self).toString();
   33.46      }
   33.47  
   33.48 @@ -121,7 +121,7 @@
   33.49       * @return value of this boolean
   33.50       */
   33.51      @Function(attributes = Attribute.NOT_ENUMERABLE)
   33.52 -    public static Object valueOf(final Object self) {
   33.53 +    public static boolean valueOf(final Object self) {
   33.54          return getBoolean(self);
   33.55      }
   33.56  
   33.57 @@ -164,7 +164,7 @@
   33.58       * @return Link to be invoked at call site.
   33.59       */
   33.60      public static GuardedInvocation lookupPrimitive(final LinkRequest request, final Object receiver) {
   33.61 -        return PrimitiveLookup.lookupPrimitive(request, Boolean.class, new NativeBoolean((Boolean)receiver), WRAPFILTER);
   33.62 +        return PrimitiveLookup.lookupPrimitive(request, Boolean.class, new NativeBoolean((Boolean)receiver), WRAPFILTER, PROTOFILTER);
   33.63      }
   33.64  
   33.65      /**
   33.66 @@ -178,7 +178,12 @@
   33.67          return new NativeBoolean((Boolean)receiver);
   33.68      }
   33.69  
   33.70 -    private static MethodHandle findWrapFilter() {
   33.71 -        return MH.findStatic(MethodHandles.lookup(), NativeBoolean.class, "wrapFilter", MH.type(NativeBoolean.class, Object.class));
   33.72 +    @SuppressWarnings("unused")
   33.73 +    private static Object protoFilter(final Object object) {
   33.74 +        return Global.instance().getBooleanPrototype();
   33.75 +    }
   33.76 +
   33.77 +    private static MethodHandle findOwnMH(final String name, final MethodType type) {
   33.78 +        return MH.findStatic(MethodHandles.lookup(), NativeBoolean.class, name, type);
   33.79      }
   33.80  }

    34.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    34.2 +++ b/src/jdk/nashorn/internal/objects/NativeDataView.java	Tue Apr 01 11:44:05 2014 -0700
    34.3 @@ -0,0 +1,1015 @@
    34.4 +/*
    34.5 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
    34.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    34.7 + *
    34.8 + * This code is free software; you can redistribute it and/or modify it
    34.9 + * under the terms of the GNU General Public License version 2 only, as
   34.10 + * published by the Free Software Foundation.  Oracle designates this
   34.11 + * particular file as subject to the "Classpath" exception as provided
   34.12 + * by Oracle in the LICENSE file that accompanied this code.
   34.13 + *
   34.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   34.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   34.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   34.17 + * version 2 for more details (a copy is included in the LICENSE file that
   34.18 + * accompanied this code).
   34.19 + *
   34.20 + * You should have received a copy of the GNU General Public License version
   34.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   34.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   34.23 + *
   34.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   34.25 + * or visit www.oracle.com if you need additional information or have any
   34.26 + * questions.
   34.27 + */
   34.28 +package jdk.nashorn.internal.objects;
   34.29 +
   34.30 +import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
   34.31 +import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
   34.32 +import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
   34.33 +
   34.34 +import java.nio.ByteBuffer;
   34.35 +import java.nio.ByteOrder;
   34.36 +import jdk.nashorn.internal.objects.annotations.Attribute;
   34.37 +import jdk.nashorn.internal.objects.annotations.Constructor;
   34.38 +import jdk.nashorn.internal.objects.annotations.Function;
   34.39 +import jdk.nashorn.internal.objects.annotations.Property;
   34.40 +import jdk.nashorn.internal.objects.annotations.ScriptClass;
   34.41 +import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
   34.42 +import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
   34.43 +import jdk.nashorn.internal.runtime.JSType;
   34.44 +import jdk.nashorn.internal.runtime.PropertyMap;
   34.45 +import jdk.nashorn.internal.runtime.ScriptObject;
   34.46 +import jdk.nashorn.internal.runtime.ScriptRuntime;
   34.47 +
   34.48 +/**
   34.49 + * <p>
   34.50 + * DataView builtin constructor. Based on the specification here:
   34.51 + * http://www.khronos.org/registry/typedarray/specs/latest/#8
   34.52 + * </p>
   34.53 + * <p>
   34.54 + * An ArrayBuffer is a useful object for representing an arbitrary chunk of data.
   34.55 + * In many cases, such data will be read from disk or from the network, and will
   34.56 + * not follow the alignment restrictions that are imposed on the typed array views
   34.57 + * described earlier. In addition, the data will often be heterogeneous in nature
   34.58 + * and have a defined byte order. The DataView view provides a low-level interface
   34.59 + * for reading such data from and writing it to an ArrayBuffer.
   34.60 + * </p>
   34.61 + * <p>
   34.62 + * Regardless of the host computer's endianness, DataView reads or writes values
   34.63 + * to or from main memory with a specified endianness: big or little.
   34.64 + * </p>
   34.65 + */
   34.66 +@ScriptClass("DataView")
   34.67 +public class NativeDataView extends ScriptObject {
   34.68 +    // initialized by nasgen
   34.69 +    private static PropertyMap $nasgenmap$;
   34.70 +
   34.71 +    // inherited ArrayBufferView properties
   34.72 +
   34.73 +    /**
   34.74 +     * Underlying ArrayBuffer storage object
   34.75 +     */
   34.76 +    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
   34.77 +    public final Object buffer;
   34.78 +
   34.79 +    /**
   34.80 +     * The offset in bytes from the start of the ArrayBuffer
   34.81 +     */
   34.82 +    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
   34.83 +    public final int byteOffset;
   34.84 +
   34.85 +    /**
   34.86 +     * The number of bytes from the offset that this DataView will reference
   34.87 +     */
   34.88 +    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
   34.89 +    public final int byteLength;
   34.90 +
   34.91 +    // underlying ByteBuffer
   34.92 +    private final ByteBuffer buf;
   34.93 +
   34.94 +    private NativeDataView(NativeArrayBuffer arrBuf) {
   34.95 +        this(arrBuf, arrBuf.getBuffer(), 0);
   34.96 +    }
   34.97 +
   34.98 +    private NativeDataView(NativeArrayBuffer arrBuf, int offset) {
   34.99 +        this(arrBuf, bufferFrom(arrBuf, offset), offset);
  34.100 +    }
  34.101 +
  34.102 +    private NativeDataView(NativeArrayBuffer arrBuf, int offset, int length) {
  34.103 +        this(arrBuf, bufferFrom(arrBuf, offset, length), offset, length);
  34.104 +    }
  34.105 +
  34.106 +    private NativeDataView(final NativeArrayBuffer arrBuf, final ByteBuffer buf, final int offset) {
  34.107 +       this(arrBuf, buf, offset, buf.capacity() - offset);
  34.108 +    }
  34.109 +
  34.110 +    private NativeDataView(final NativeArrayBuffer arrBuf, final ByteBuffer buf, final int offset, final int length) {
  34.111 +        super(Global.instance().getDataViewPrototype(), $nasgenmap$);
  34.112 +        this.buffer = arrBuf;
  34.113 +        this.byteOffset = offset;
  34.114 +        this.byteLength = length;
  34.115 +        this.buf = buf;
  34.116 +    }
  34.117 +
  34.118 +    /**
  34.119 +     * Create a new DataView object using the passed ArrayBuffer for its
  34.120 +     * storage. Optional byteOffset and byteLength can be used to limit the
  34.121 +     * section of the buffer referenced. The byteOffset indicates the offset in
  34.122 +     * bytes from the start of the ArrayBuffer, and the byteLength is the number
  34.123 +     * of bytes from the offset that this DataView will reference. If both
  34.124 +     * byteOffset and byteLength are omitted, the DataView spans the entire
  34.125 +     * ArrayBuffer range. If the byteLength is omitted, the DataView extends from
  34.126 +     * the given byteOffset until the end of the ArrayBuffer.
  34.127 +     *
  34.128 +     * If the given byteOffset and byteLength references an area beyond the end
  34.129 +     * of the ArrayBuffer an exception is raised.
  34.130 +
  34.131 +     * @param newObj if this constructor was invoked with 'new' or not
  34.132 +     * @param self   constructor function object
  34.133 +     * @param args   arguments to the constructor
  34.134 +     * @return newly constructed DataView object
  34.135 +     */
  34.136 +    @Constructor(arity = 1)
  34.137 +    public static NativeDataView constructor(final boolean newObj, final Object self, final Object... args) {
  34.138 +        if (args.length == 0 || !(args[0] instanceof NativeArrayBuffer)) {
  34.139 +            throw typeError("not.an.arraybuffer.in.dataview");
  34.140 +        }
  34.141 +
  34.142 +        final NativeArrayBuffer arrBuf = (NativeArrayBuffer) args[0];
  34.143 +        switch (args.length) {
  34.144 +            case 1:
  34.145 +                return new NativeDataView(arrBuf);
  34.146 +            case 2:
  34.147 +                return new NativeDataView(arrBuf, JSType.toInt32(args[1]));
  34.148 +            default:
  34.149 +                return new NativeDataView(arrBuf, JSType.toInt32(args[1]), JSType.toInt32(args[2]));
  34.150 +        }
  34.151 +    }
  34.152 +
  34.153 +    /**
  34.154 +     * Specialized version of DataView constructor
  34.155 +     *
  34.156 +     * @param newObj if this constructor was invoked with 'new' or not
  34.157 +     * @param self   constructor function object
  34.158 +     * @param arrBuf underlying ArrayBuffer storage object
  34.159 +     * @param offset offset in bytes from the start of the ArrayBuffer
  34.160 +     * @return newly constructed DataView object
  34.161 +     */
  34.162 +    @SpecializedConstructor
  34.163 +    public static NativeDataView constructor(final boolean newObj, final Object self, final Object arrBuf, final int offset) {
  34.164 +        if (!(arrBuf instanceof NativeArrayBuffer)) {
  34.165 +            throw typeError("not.an.arraybuffer.in.dataview");
  34.166 +        }
  34.167 +        return new NativeDataView((NativeArrayBuffer) arrBuf, offset);
  34.168 +    }
  34.169 +
  34.170 +    /**
  34.171 +     * Specialized version of DataView constructor
  34.172 +     *
  34.173 +     * @param newObj if this constructor was invoked with 'new' or not
  34.174 +     * @param self   constructor function object
  34.175 +     * @param arrBuf underlying ArrayBuffer storage object
  34.176 +     * @param offset in bytes from the start of the ArrayBuffer
  34.177 +     * @param length is the number of bytes from the offset that this DataView will reference
  34.178 +     * @return newly constructed DataView object
  34.179 +     */
  34.180 +    @SpecializedConstructor
  34.181 +    public static NativeDataView constructor(final boolean newObj, final Object self, final Object arrBuf, final int offset, final int length) {
  34.182 +        if (!(arrBuf instanceof NativeArrayBuffer)) {
  34.183 +            throw typeError("not.an.arraybuffer.in.dataview");
  34.184 +        }
  34.185 +        return new NativeDataView((NativeArrayBuffer) arrBuf, offset, length);
  34.186 +    }
  34.187 +
  34.188 +    // Gets the value of the given type at the specified byte offset
  34.189 +    // from the start of the view. There is no alignment constraint;
  34.190 +    // multi-byte values may be fetched from any offset.
  34.191 +    //
  34.192 +    // For multi-byte values, the optional littleEndian argument
  34.193 +    // indicates whether a big-endian or little-endian value should be
  34.194 +    // read. If false or undefined, a big-endian value is read.
  34.195 +    //
  34.196 +    // These methods raise an exception if they would read
  34.197 +    // beyond the end of the view.
  34.198 +
  34.199 +    /**
  34.200 +     * Get 8-bit signed int from given byteOffset
  34.201 +     *
  34.202 +     * @param self DataView object
  34.203 +     * @param byteOffset byte offset to read from
  34.204 +     * @return 8-bit signed int value at the byteOffset
  34.205 +     */
  34.206 +    @Function(attributes = Attribute.NOT_ENUMERABLE)
  34.207 +    public static int getInt8(final Object self, final Object byteOffset) {
  34.208 +        try {
  34.209 +            return getBuffer(self).get(JSType.toInt32(byteOffset));
  34.210 +        } catch (final IndexOutOfBoundsException ioe) {
  34.211 +            throw rangeError(ioe, "dataview.offset");
  34.212 +        }
  34.213 +    }
  34.214 +
  34.215 +    /**
  34.216 +     * Get 8-bit signed int from given byteOffset
  34.217 +     *
  34.218 +     * @param self DataView object
  34.219 +     * @param byteOffset byte offset to read from
  34.220 +     * @return 8-bit signed int value at the byteOffset
  34.221 +     */
  34.222 +    @SpecializedFunction
  34.223 +    public static int getInt8(final Object self, final int byteOffset) {
  34.224 +        try {
  34.225 +            return getBuffer(self).get(byteOffset);
  34.226 +        } catch (final IndexOutOfBoundsException ioe) {
  34.227 +            throw rangeError(ioe, "dataview.offset");
  34.228 +        }
  34.229 +    }
  34.230 +
  34.231 +    /**
  34.232 +     * Get 8-bit unsigned int from given byteOffset
  34.233 +     *
  34.234 +     * @param self DataView object
  34.235 +     * @param byteOffset byte offset to read from
  34.236 +     * @return 8-bit unsigned int value at the byteOffset
  34.237 +     */
  34.238 +    @Function(attributes = Attribute.NOT_ENUMERABLE)
  34.239 +    public static int getUint8(final Object self, final Object byteOffset) {
  34.240 +        try {
  34.241 +            return (0xFF & getBuffer(self).get(JSType.toInt32(byteOffset)));
  34.242 +        } catch (final IndexOutOfBoundsException ioe) {
  34.243 +            throw rangeError(ioe, "dataview.offset");
  34.244 +        }
  34.245 +    }
  34.246 +
  34.247 +    /**
  34.248 +     * Get 8-bit unsigned int from given byteOffset
  34.249 +     *
  34.250 +     * @param self DataView object
  34.251 +     * @param byteOffset byte offset to read from
  34.252 +     * @return 8-bit unsigned int value at the byteOffset
  34.253 +     */
  34.254 +    @SpecializedFunction
  34.255 +    public static int getUint8(final Object self, final int byteOffset) {
  34.256 +        try {
  34.257 +            return (0xFF & getBuffer(self).get(byteOffset));
  34.258 +        } catch (final IndexOutOfBoundsException ioe) {
  34.259 +            throw rangeError(ioe, "dataview.offset");
  34.260 +        }
  34.261 +    }
  34.262 +
  34.263 +    /**
  34.264 +     * Get 16-bit signed int from given byteOffset
  34.265 +     *
  34.266 +     * @param self DataView object
  34.267 +     * @param byteOffset byte offset to read from
  34.268 +     * @param littleEndian (optional) flag indicating whether to read in little endian order
  34.269 +     * @return 16-bit signed int value at the byteOffset
  34.270 +     */
  34.271 +    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
  34.272 +    public static int getInt16(final Object self, final Object byteOffset, final Object littleEndian) {
  34.273 +        try {
  34.274 +            return getBuffer(self, littleEndian).getShort(JSType.toInt32(byteOffset));
  34.275 +        } catch (final IndexOutOfBoundsException ioe) {
  34.276 +            throw rangeError(ioe, "dataview.offset");
  34.277 +        }
  34.278 +    }
  34.279 +
  34.280 +    /**
  34.281 +     * Get 16-bit signed int from given byteOffset
  34.282 +     *
  34.283 +     * @param self DataView object
  34.284 +     * @param byteOffset byte offset to read from
  34.285 +     * @return 16-bit signed int value at the byteOffset
  34.286 +     */
  34.287 +    @SpecializedFunction
  34.288 +    public static int getInt16(final Object self, final int byteOffset) {
  34.289 +        try {
  34.290 +            return getBuffer(self, false).getShort(byteOffset);
  34.291 +        } catch (final IndexOutOfBoundsException ioe) {
  34.292 +            throw rangeError(ioe, "dataview.offset");
  34.293 +        }
  34.294 +    }
  34.295 +
  34.296 +    /**
  34.297 +     * Get 16-bit signed int from given byteOffset
  34.298 +     *
  34.299 +     * @param self DataView object
  34.300 +     * @param byteOffset byte offset to read from
  34.301 +     * @param littleEndian (optional) flag indicating whether to read in little endian order
  34.302 +     * @return 16-bit signed int value at the byteOffset
  34.303 +     */
  34.304 +    @SpecializedFunction
  34.305 +    public static int getInt16(final Object self, final int byteOffset, final boolean littleEndian) {
  34.306 +        try {
  34.307 +            return getBuffer(self, littleEndian).getShort(byteOffset);
  34.308 +        } catch (final IndexOutOfBoundsException ioe) {
  34.309 +            throw rangeError(ioe, "dataview.offset");
  34.310 +        }
  34.311 +    }
  34.312 +
  34.313 +    /**
  34.314 +     * Get 16-bit unsigned int from given byteOffset
  34.315 +     *
  34.316 +     * @param self DataView object
  34.317 +     * @param byteOffset byte offset to read from
  34.318 +     * @param littleEndian (optional) flag indicating whether to read in little endian order
  34.319 +     * @return 16-bit unsigned int value at the byteOffset
  34.320 +     */
  34.321 +    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
  34.322 +    public static int getUint16(final Object self, final Object byteOffset, final Object littleEndian) {
  34.323 +        try {
  34.324 +            return (int) (0xFFFF & getBuffer(self, littleEndian).getShort(JSType.toInt32(byteOffset)));
  34.325 +        } catch (final IndexOutOfBoundsException ioe) {
  34.326 +            throw rangeError(ioe, "dataview.offset");
  34.327 +        }
  34.328 +    }
  34.329 +
  34.330 +    /**
  34.331 +     * Get 16-bit unsigned int from given byteOffset
  34.332 +     *
  34.333 +     * @param self DataView object
  34.334 +     * @param byteOffset byte offset to read from
  34.335 +     * @return 16-bit unsigned int value at the byteOffset
  34.336 +     */
  34.337 +    @SpecializedFunction
  34.338 +    public static int getUint16(final Object self, final int byteOffset) {
  34.339 +        try {
  34.340 +            return (int) (0xFFFF & getBuffer(self, false).getShort(byteOffset));
  34.341 +        } catch (final IndexOutOfBoundsException ioe) {
  34.342 +            throw rangeError(ioe, "dataview.offset");
  34.343 +        }
  34.344 +    }
  34.345 +
  34.346 +    /**
  34.347 +     * Get 16-bit unsigned int from given byteOffset
  34.348 +     *
  34.349 +     * @param self DataView object
  34.350 +     * @param byteOffset byte offset to read from
  34.351 +     * @param littleEndian (optional) flag indicating whether to read in little endian order
  34.352 +     * @return 16-bit unsigned int value at the byteOffset
  34.353 +     */
  34.354 +    @SpecializedFunction
  34.355 +    public static int getUint16(final Object self, final int byteOffset, final boolean littleEndian) {
  34.356 +        try {
  34.357 +            return (int) (0xFFFF & getBuffer(self, littleEndian).getShort(byteOffset));
  34.358 +        } catch (final IndexOutOfBoundsException ioe) {
  34.359 +            throw rangeError(ioe, "dataview.offset");
  34.360 +        }
  34.361 +    }
  34.362 +
  34.363 +    /**
  34.364 +     * Get 32-bit signed int from given byteOffset
  34.365 +     *
  34.366 +     * @param self DataView object
  34.367 +     * @param byteOffset byte offset to read from
  34.368 +     * @param littleEndian (optional) flag indicating whether to read in little endian order
  34.369 +     * @return 32-bit signed int value at the byteOffset
  34.370 +     */
  34.371 +    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
  34.372 +    public static int getInt32(final Object self, final Object byteOffset, final Object littleEndian) {
  34.373 +        try {
  34.374 +            return getBuffer(self, littleEndian).getInt(JSType.toInt32(byteOffset));
  34.375 +        } catch (final IndexOutOfBoundsException ioe) {
  34.376 +            throw rangeError(ioe, "dataview.offset");
  34.377 +        }
  34.378 +    }
  34.379 +
  34.380 +    /**
  34.381 +     * Get 32-bit signed int from given byteOffset
  34.382 +     *
  34.383 +     * @param self DataView object
  34.384 +     * @param byteOffset byte offset to read from
  34.385 +     * @return 32-bit signed int value at the byteOffset
  34.386 +     */
  34.387 +    @SpecializedFunction
  34.388 +    public static int getInt32(final Object self, final int byteOffset) {
  34.389 +        try {
  34.390 +            return getBuffer(self, false).getInt(byteOffset);
  34.391 +        } catch (final IndexOutOfBoundsException ioe) {
  34.392 +            throw rangeError(ioe, "dataview.offset");
  34.393 +        }
  34.394 +    }
  34.395 +
  34.396 +    /**
  34.397 +     * Get 32-bit signed int from given byteOffset
  34.398 +     *
  34.399 +     * @param self DataView object
  34.400 +     * @param byteOffset byte offset to read from
  34.401 +     * @param littleEndian (optional) flag indicating whether to read in little endian order
  34.402 +     * @return 32-bit signed int value at the byteOffset
  34.403 +     */
  34.404 +    @SpecializedFunction
  34.405 +    public static int getInt32(final Object self, final int byteOffset, final boolean littleEndian) {
  34.406 +        try {
  34.407 +            return getBuffer(self, littleEndian).getInt(byteOffset);
  34.408 +        } catch (final IndexOutOfBoundsException ioe) {
  34.409 +            throw rangeError(ioe, "dataview.offset");
  34.410 +        }
  34.411 +    }
  34.412 +
  34.413 +    /**
  34.414 +     * Get 32-bit unsigned int from given byteOffset
  34.415 +     *
  34.416 +     * @param self DataView object
  34.417 +     * @param byteOffset byte offset to read from
  34.418 +     * @param littleEndian (optional) flag indicating whether to read in little endian order
  34.419 +     * @return 32-bit unsigned int value at the byteOffset
  34.420 +     */
  34.421 +    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
  34.422 +    public static long getUint32(final Object self, final Object byteOffset, final Object littleEndian) {
  34.423 +        try {
  34.424 +            return (long) (0xFFFFFFFFL & getBuffer(self, littleEndian).getInt(JSType.toInt32(byteOffset)));
  34.425 +        } catch (final IndexOutOfBoundsException ioe) {
  34.426 +            throw rangeError(ioe, "dataview.offset");
  34.427 +        }
  34.428 +    }
  34.429 +
  34.430 +    /**
  34.431 +     * Get 32-bit unsigned int from given byteOffset
  34.432 +     *
  34.433 +     * @param self DataView object
  34.434 +     * @param byteOffset byte offset to read from
  34.435 +     * @return 32-bit unsigned int value at the byteOffset
  34.436 +     */
  34.437 +    @SpecializedFunction
  34.438 +    public static long getUint32(final Object self, final int byteOffset) {
  34.439 +        try {
  34.440 +            return (long) (0xFFFFFFFFL & getBuffer(self, false).getInt(JSType.toInt32(byteOffset)));
  34.441 +        } catch (final IndexOutOfBoundsException ioe) {
  34.442 +            throw rangeError(ioe, "dataview.offset");
  34.443 +        }
  34.444 +    }
  34.445 +
  34.446 +    /**
  34.447 +     * Get 32-bit unsigned int from given byteOffset
  34.448 +     *
  34.449 +     * @param self DataView object
  34.450 +     * @param byteOffset byte offset to read from
  34.451 +     * @param littleEndian (optional) flag indicating whether to read in little endian order
  34.452 +     * @return 32-bit unsigned int value at the byteOffset
  34.453 +     */
  34.454 +    @SpecializedFunction
  34.455 +    public static long getUint32(final Object self, final int byteOffset, final boolean littleEndian) {
  34.456 +        try {
  34.457 +            return (long) (0xFFFFFFFFL & getBuffer(self, littleEndian).getInt(JSType.toInt32(byteOffset)));
  34.458 +        } catch (final IndexOutOfBoundsException ioe) {
  34.459 +            throw rangeError(ioe, "dataview.offset");
  34.460 +        }
  34.461 +    }
  34.462 +
  34.463 +    /**
  34.464 +     * Get 32-bit float value from given byteOffset
  34.465 +     *
  34.466 +     * @param self DataView object
  34.467 +     * @param byteOffset byte offset to read from
  34.468 +     * @param littleEndian (optional) flag indicating whether to read in little endian order
  34.469 +     * @return 32-bit float value at the byteOffset
  34.470 +     */
  34.471 +    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
  34.472 +    public static double getFloat32(final Object self, final Object byteOffset, final Object littleEndian) {
  34.473 +        try {
  34.474 +            return getBuffer(self, littleEndian).getFloat(JSType.toInt32(byteOffset));
  34.475 +        } catch (final IndexOutOfBoundsException ioe) {
  34.476 +            throw rangeError(ioe, "dataview.offset");
  34.477 +        }
  34.478 +    }
  34.479 +
  34.480 +    /**
  34.481 +     * Get 32-bit float value from given byteOffset
  34.482 +     *
  34.483 +     * @param self DataView object
  34.484 +     * @param byteOffset byte offset to read from
  34.485 +     * @return 32-bit float value at the byteOffset
  34.486 +     */
  34.487 +    @SpecializedFunction
  34.488 +    public static double getFloat32(final Object self, final int byteOffset) {
  34.489 +        try {
  34.490 +            return getBuffer(self, false).getFloat(byteOffset);
  34.491 +        } catch (final IndexOutOfBoundsException ioe) {
  34.492 +            throw rangeError(ioe, "dataview.offset");
  34.493 +        }
  34.494 +    }
  34.495 +
  34.496 +    /**
  34.497 +     * Get 32-bit float value from given byteOffset
  34.498 +     *
  34.499 +     * @param self DataView object
  34.500 +     * @param byteOffset byte offset to read from
  34.501 +     * @param littleEndian (optional) flag indicating whether to read in little endian order
  34.502 +     * @return 32-bit float value at the byteOffset
  34.503 +     */
  34.504 +    @SpecializedFunction
  34.505 +    public static double getFloat32(final Object self, final int byteOffset, final boolean littleEndian) {
  34.506 +        try {
  34.507 +            return getBuffer(self, littleEndian).getFloat(byteOffset);
  34.508 +        } catch (final IndexOutOfBoundsException ioe) {
  34.509 +            throw rangeError(ioe, "dataview.offset");
  34.510 +        }
  34.511 +    }
  34.512 +
  34.513 +    /**
  34.514 +     * Get 64-bit float value from given byteOffset
  34.515 +     *
  34.516 +     * @param self DataView object
  34.517 +     * @param byteOffset byte offset to read from
  34.518 +     * @param littleEndian (optional) flag indicating whether to read in little endian order
  34.519 +     * @return 64-bit float value at the byteOffset
  34.520 +     */
  34.521 +    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
  34.522 +    public static double getFloat64(final Object self, final Object byteOffset, final Object littleEndian) {
  34.523 +        try {
  34.524 +            return getBuffer(self, littleEndian).getDouble(JSType.toInt32(byteOffset));
  34.525 +        } catch (final IndexOutOfBoundsException ioe) {
  34.526 +            throw rangeError(ioe, "dataview.offset");
  34.527 +        }
  34.528 +    }
  34.529 +
  34.530 +    /**
  34.531 +     * Get 64-bit float value from given byteOffset
  34.532 +     *
  34.533 +     * @param self DataView object
  34.534 +     * @param byteOffset byte offset to read from
  34.535 +     * @return 64-bit float value at the byteOffset
  34.536 +     */
  34.537 +    @SpecializedFunction
  34.538 +    public static double getFloat64(final Object self, final int byteOffset) {
  34.539 +        try {
  34.540 +            return getBuffer(self, false).getDouble(byteOffset);
  34.541 +        } catch (final IndexOutOfBoundsException ioe) {
  34.542 +            throw rangeError(ioe, "dataview.offset");
  34.543 +        }
  34.544 +    }
  34.545 +
  34.546 +    /**
  34.547 +     * Get 64-bit float value from given byteOffset
  34.548 +     *
  34.549 +     * @param self DataView object
  34.550 +     * @param byteOffset byte offset to read from
  34.551 +     * @param littleEndian (optional) flag indicating whether to read in little endian order
  34.552 +     * @return 64-bit float value at the byteOffset
  34.553 +     */
  34.554 +    @SpecializedFunction
  34.555 +    public static double getFloat64(final Object self, final int byteOffset, final boolean littleEndian) {
  34.556 +        try {
  34.557 +            return getBuffer(self, littleEndian).getDouble(byteOffset);
  34.558 +        } catch (final IndexOutOfBoundsException ioe) {
  34.559 +            throw rangeError(ioe, "dataview.offset");
  34.560 +        }
  34.561 +    }
  34.562 +
  34.563 +    // Stores a value of the given type at the specified byte offset
  34.564 +    // from the start of the view. There is no alignment constraint;
  34.565 +    // multi-byte values may be stored at any offset.
  34.566 +    //
  34.567 +    // For multi-byte values, the optional littleEndian argument
  34.568 +    // indicates whether the value should be stored in big-endian or
  34.569 +    // little-endian byte order. If false or undefined, the value is
  34.570 +    // stored in big-endian byte order.
  34.571 +    //
  34.572 +    // These methods raise an exception if they would write
  34.573 +    // beyond the end of the view.
  34.574 +
  34.575 +    /**
  34.576 +     * Set 8-bit signed int at the given byteOffset
  34.577 +     *
  34.578 +     * @param self DataView object
  34.579 +     * @param byteOffset byte offset to read from
  34.580 +     * @param value byte value to set
  34.581 +     * @return undefined
  34.582 +     */
  34.583 +    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 2)
  34.584 +    public static Object setInt8(final Object self, final Object byteOffset, final Object value) {
  34.585 +        try {
  34.586 +            getBuffer(self).put(JSType.toInt32(byteOffset), (byte)JSType.toInt32(value));
  34.587 +            return UNDEFINED;
  34.588 +        } catch (final IndexOutOfBoundsException ioe) {
  34.589 +            throw rangeError(ioe, "dataview.offset");
  34.590 +        }
  34.591 +    }
  34.592 +
  34.593 +    /**
  34.594 +     * Set 8-bit signed int at the given byteOffset
  34.595 +     *
  34.596 +     * @param self DataView object
  34.597 +     * @param byteOffset byte offset to read from
  34.598 +     * @param value byte value to set
  34.599 +     * @return undefined
  34.600 +     */
  34.601 +    @SpecializedFunction
  34.602 +    public static Object setInt8(final Object self, final int byteOffset, final int value) {
  34.603 +        try {
  34.604 +            getBuffer(self).put(byteOffset, (byte)value);
  34.605 +            return UNDEFINED;
  34.606 +        } catch (final IndexOutOfBoundsException ioe) {
  34.607 +            throw rangeError(ioe, "dataview.offset");
  34.608 +        }
  34.609 +    }
  34.610 +
  34.611 +    /**
  34.612 +     * Set 8-bit unsigned int at the given byteOffset
  34.613 +     *
  34.614 +     * @param self DataView object
  34.615 +     * @param byteOffset byte offset to write at
  34.616 +     * @param value byte value to set
  34.617 +     * @return undefined
  34.618 +     */
  34.619 +    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 2)
  34.620 +    public static Object setUint8(final Object self, final Object byteOffset, final Object value) {
  34.621 +        try {
  34.622 +            getBuffer(self).put(JSType.toInt32(byteOffset), (byte)JSType.toInt32(value));
  34.623 +            return UNDEFINED;
  34.624 +        } catch (final IndexOutOfBoundsException ioe) {
  34.625 +            throw rangeError(ioe, "dataview.offset");
  34.626 +        }
  34.627 +    }
  34.628 +
  34.629 +    /**
  34.630 +     * Set 8-bit unsigned int at the given byteOffset
  34.631 +     *
  34.632 +     * @param self DataView object
  34.633 +     * @param byteOffset byte offset to write at
  34.634 +     * @param value byte value to set
  34.635 +     * @return undefined
  34.636 +     */
  34.637 +    @SpecializedFunction
  34.638 +    public static Object setUint8(final Object self, final int byteOffset, final int value) {
  34.639 +        try {
  34.640 +            getBuffer(self).put(byteOffset, (byte)value);
  34.641 +            return UNDEFINED;
  34.642 +        } catch (final IndexOutOfBoundsException ioe) {
  34.643 +            throw rangeError(ioe, "dataview.offset");
  34.644 +        }
  34.645 +    }
  34.646 +
  34.647 +    /**
  34.648 +     * Set 16-bit signed int at the given byteOffset
  34.649 +     *
  34.650 +     * @param self DataView object
  34.651 +     * @param byteOffset byte offset to write at
  34.652 +     * @param value short value to set
  34.653 +     * @param littleEndian (optional) flag indicating whether to write in little endian order
  34.654 +     * @return undefined
  34.655 +     */
  34.656 +    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 2)
  34.657 +    public static Object setInt16(final Object self, final Object byteOffset, final Object value, final Object littleEndian) {
  34.658 +        try {
  34.659 +            getBuffer(self, littleEndian).putShort(JSType.toInt32(byteOffset), (short)JSType.toInt32(value));
  34.660 +            return UNDEFINED;
  34.661 +        } catch (final IndexOutOfBoundsException ioe) {
  34.662 +            throw rangeError(ioe, "dataview.offset");
  34.663 +        }
  34.664 +    }
  34.665 +
  34.666 +    /**
  34.667 +     * Set 16-bit signed int at the given byteOffset
  34.668 +     *
  34.669 +     * @param self DataView object
  34.670 +     * @param byteOffset byte offset to write at
  34.671 +     * @param value short value to set
  34.672 +     * @return undefined
  34.673 +     */
  34.674 +    @SpecializedFunction
  34.675 +    public static Object setInt16(final Object self, final int byteOffset, final int value) {
  34.676 +        try {
  34.677 +            getBuffer(self, false).putShort(byteOffset, (short)value);
  34.678 +            return UNDEFINED;
  34.679 +        } catch (final IndexOutOfBoundsException ioe) {
  34.680 +            throw rangeError(ioe, "dataview.offset");
  34.681 +        }
  34.682 +    }
  34.683 +
  34.684 +    /**
  34.685 +     * Set 16-bit signed int at the given byteOffset
  34.686 +     *
  34.687 +     * @param self DataView object
  34.688 +     * @param byteOffset byte offset to write at
  34.689 +     * @param value short value to set
  34.690 +     * @param littleEndian (optional) flag indicating whether to write in little endian order
  34.691 +     * @return undefined
  34.692 +     */
  34.693 +    @SpecializedFunction
  34.694 +    public static Object setInt16(final Object self, final int byteOffset, final int value, final boolean littleEndian) {
  34.695 +        try {
  34.696 +            getBuffer(self, littleEndian).putShort(byteOffset, (short)value);
  34.697 +            return UNDEFINED;
  34.698 +        } catch (final IndexOutOfBoundsException ioe) {
  34.699 +            throw rangeError(ioe, "dataview.offset");
  34.700 +        }
  34.701 +    }
  34.702 +
  34.703 +    /**
  34.704 +     * Set 16-bit unsigned int at the given byteOffset
  34.705 +     *
  34.706 +     * @param self DataView object
  34.707 +     * @param byteOffset byte offset to write at
  34.708 +     * @param value short value to set
  34.709 +     * @param littleEndian (optional) flag indicating whether to write in little endian order
  34.710 +     * @return undefined
  34.711 +     */
  34.712 +    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 2)
  34.713 +    public static Object setUint16(final Object self, final Object byteOffset, final Object value, final Object littleEndian) {
  34.714 +        try {
  34.715 +            getBuffer(self, littleEndian).putShort(JSType.toInt32(byteOffset), (short)JSType.toInt32(value));
  34.716 +            return UNDEFINED;
  34.717 +        } catch (final IndexOutOfBoundsException ioe) {
  34.718 +            throw rangeError(ioe, "dataview.offset");
  34.719 +        }
  34.720 +    }
  34.721 +
  34.722 +    /**
  34.723 +     * Set 16-bit unsigned int at the given byteOffset
  34.724 +     *
  34.725 +     * @param self DataView object
  34.726 +     * @param byteOffset byte offset to write at
  34.727 +     * @param value short value to set
  34.728 +     * @return undefined
  34.729 +     */
  34.730 +    @SpecializedFunction
  34.731 +    public static Object setUint16(final Object self, final int byteOffset, final int value) {
  34.732 +        try {
  34.733 +            getBuffer(self, false).putShort(byteOffset, (short)value);
  34.734 +            return UNDEFINED;
  34.735 +        } catch (final IndexOutOfBoundsException ioe) {
  34.736 +            throw rangeError(ioe, "dataview.offset");
  34.737 +        }
  34.738 +    }
  34.739 +
  34.740 +    /**
  34.741 +     * Set 16-bit unsigned int at the given byteOffset
  34.742 +     *
  34.743 +     * @param self DataView object
  34.744 +     * @param byteOffset byte offset to write at
  34.745 +     * @param value short value to set
  34.746 +     * @param littleEndian (optional) flag indicating whether to write in little endian order
  34.747 +     * @return undefined
  34.748 +     */
  34.749 +    @SpecializedFunction
  34.750 +    public static Object setUint16(final Object self, final int byteOffset, final int value, final boolean littleEndian) {
  34.751 +        try {
  34.752 +            getBuffer(self, littleEndian).putShort(byteOffset, (short)value);
  34.753 +            return UNDEFINED;
  34.754 +        } catch (final IndexOutOfBoundsException ioe) {
  34.755 +            throw rangeError(ioe, "dataview.offset");
  34.756 +        }
  34.757 +    }
  34.758 +
  34.759 +    /**
  34.760 +     * Set 32-bit signed int at the given byteOffset
  34.761 +     *
  34.762 +     * @param self DataView object
  34.763 +     * @param byteOffset byte offset to write at
  34.764 +     * @param value int value to set
  34.765 +     * @param littleEndian (optional) flag indicating whether to write in little endian order
  34.766 +     * @return undefined
  34.767 +     */
  34.768 +    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 2)
  34.769 +    public static Object setInt32(final Object self, final Object byteOffset, final Object value, final Object littleEndian) {
  34.770 +        try {
  34.771 +            getBuffer(self, littleEndian).putInt(JSType.toInt32(byteOffset), (int)JSType.toInt32(value));
  34.772 +            return UNDEFINED;
  34.773 +        } catch (final IndexOutOfBoundsException ioe) {
  34.774 +            throw rangeError(ioe, "dataview.offset");
  34.775 +        }
  34.776 +    }
  34.777 +
  34.778 +    /**
  34.779 +     * Set 32-bit signed int at the given byteOffset
  34.780 +     *
  34.781 +     * @param self DataView object
  34.782 +     * @param byteOffset byte offset to write at
  34.783 +     * @param value int value to set
  34.784 +     * @return undefined
  34.785 +     */
  34.786 +    @SpecializedFunction
  34.787 +    public static Object setInt32(final Object self, final int byteOffset, final int value) {
  34.788 +        try {
  34.789 +            getBuffer(self, false).putInt(byteOffset, value);
  34.790 +            return UNDEFINED;
  34.791 +        } catch (final IndexOutOfBoundsException ioe) {
  34.792 +            throw rangeError(ioe, "dataview.offset");
  34.793 +        }
  34.794 +    }
  34.795 +
  34.796 +    /**
  34.797 +     * Set 32-bit signed int at the given byteOffset
  34.798 +     *
  34.799 +     * @param self DataView object
  34.800 +     * @param byteOffset byte offset to write at
  34.801 +     * @param value int value to set
  34.802 +     * @param littleEndian (optional) flag indicating whether to write in little endian order
  34.803 +     * @return undefined
  34.804 +     */
  34.805 +    @SpecializedFunction
  34.806 +    public static Object setInt32(final Object self, final int byteOffset, final int value, final boolean littleEndian) {
  34.807 +        try {
  34.808 +            getBuffer(self, littleEndian).putInt(byteOffset, value);
  34.809 +            return UNDEFINED;
  34.810 +        } catch (final IndexOutOfBoundsException ioe) {
  34.811 +            throw rangeError(ioe, "dataview.offset");
  34.812 +        }
  34.813 +    }
  34.814 +
  34.815 +    /**
  34.816 +     * Set 32-bit unsigned int at the given byteOffset
  34.817 +     *
  34.818 +     * @param self DataView object
  34.819 +     * @param byteOffset byte offset to write at
  34.820 +     * @param value int value to set
  34.821 +     * @param littleEndian (optional) flag indicating whether to write in little endian order
  34.822 +     * @return undefined
  34.823 +     */
  34.824 +    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 2)
  34.825 +    public static Object setUint32(final Object self, final Object byteOffset, final Object value, final Object littleEndian) {
  34.826 +        try {
  34.827 +            getBuffer(self, littleEndian).putInt(JSType.toInt32(byteOffset), (int)JSType.toUint32(value));
  34.828 +            return UNDEFINED;
  34.829 +        } catch (final IndexOutOfBoundsException ioe) {
  34.830 +            throw rangeError(ioe, "dataview.offset");
  34.831 +        }
  34.832 +    }
  34.833 +
  34.834 +    /**
  34.835 +     * Set 32-bit unsigned int at the given byteOffset
  34.836 +     *
  34.837 +     * @param self DataView object
  34.838 +     * @param byteOffset byte offset to write at
  34.839 +     * @param value int value to set
  34.840 +     * @return undefined
  34.841 +     */
  34.842 +    @SpecializedFunction
  34.843 +    public static Object setUint32(final Object self, final int byteOffset, final long value) {
  34.844 +        try {
  34.845 +            getBuffer(self, false).putInt(byteOffset, (int)value);
  34.846 +            return UNDEFINED;
  34.847 +        } catch (final IndexOutOfBoundsException ioe) {
  34.848 +            throw rangeError(ioe, "dataview.offset");
  34.849 +        }
  34.850 +    }
  34.851 +
  34.852 +    /**
  34.853 +     * Set 32-bit unsigned int at the given byteOffset
  34.854 +     *
  34.855 +     * @param self DataView object
  34.856 +     * @param byteOffset byte offset to write at
  34.857 +     * @param value int value to set
  34.858 +     * @param littleEndian (optional) flag indicating whether to write in little endian order
  34.859 +     * @return undefined
  34.860 +     */
  34.861 +    @SpecializedFunction
  34.862 +    public static Object setUint32(final Object self, final int byteOffset, final long value, final boolean littleEndian) {
  34.863 +        try {
  34.864 +            getBuffer(self, littleEndian).putInt(byteOffset, (int)value);
  34.865 +            return UNDEFINED;
  34.866 +        } catch (final IndexOutOfBoundsException ioe) {
  34.867 +            throw rangeError(ioe, "dataview.offset");
  34.868 +        }
  34.869 +    }
  34.870 +
  34.871 +    /**
  34.872 +     * Set 32-bit float at the given byteOffset
  34.873 +     *
  34.874 +     * @param self DataView object
  34.875 +     * @param byteOffset byte offset to write at
  34.876 +     * @param value float value to set
  34.877 +     * @param littleEndian (optional) flag indicating whether to write in little endian order
  34.878 +     * @return undefined
  34.879 +     */
  34.880 +    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 2)
  34.881 +    public static Object setFloat32(final Object self, final Object byteOffset, final Object value, final Object littleEndian) {
  34.882 +        try {
  34.883 +            getBuffer(self, littleEndian).putFloat((int)JSType.toUint32(byteOffset), (float)JSType.toNumber(value));
  34.884 +            return UNDEFINED;
  34.885 +        } catch (final IndexOutOfBoundsException ioe) {
  34.886 +            throw rangeError(ioe, "dataview.offset");
  34.887 +        }
  34.888 +    }
  34.889 +
  34.890 +    /**
  34.891 +     * Set 32-bit float at the given byteOffset
  34.892 +     *
  34.893 +     * @param self DataView object
  34.894 +     * @param byteOffset byte offset to write at
  34.895 +     * @param value float value to set
  34.896 +     * @return undefined
  34.897 +     */
  34.898 +    @SpecializedFunction
  34.899 +    public static Object setFloat32(final Object self, final int byteOffset, final double value) {
  34.900 +        try {
  34.901 +            getBuffer(self, false).putFloat(byteOffset, (float)value);
  34.902 +            return UNDEFINED;
  34.903 +        } catch (final IndexOutOfBoundsException ioe) {
  34.904 +            throw rangeError(ioe, "dataview.offset");
  34.905 +        }
  34.906 +    }
  34.907 +
  34.908 +    /**
  34.909 +     * Set 32-bit float at the given byteOffset
  34.910 +     *
  34.911 +     * @param self DataView object
  34.912 +     * @param byteOffset byte offset to write at
  34.913 +     * @param value float value to set
  34.914 +     * @param littleEndian (optional) flag indicating whether to write in little endian order
  34.915 +     * @return undefined
  34.916 +     */
  34.917 +    @SpecializedFunction
  34.918 +    public static Object setFloat32(final Object self, final int byteOffset, final double value, final boolean littleEndian) {
  34.919 +        try {
  34.920 +            getBuffer(self, littleEndian).putFloat(byteOffset, (float)value);
  34.921 +            return UNDEFINED;
  34.922 +        } catch (final IndexOutOfBoundsException ioe) {
  34.923 +            throw rangeError(ioe, "dataview.offset");
  34.924 +        }
  34.925 +    }
  34.926 +
  34.927 +    /**
  34.928 +     * Set 64-bit float at the given byteOffset
  34.929 +     *
  34.930 +     * @param self DataView object
  34.931 +     * @param byteOffset byte offset to write at
  34.932 +     * @param value double value to set
  34.933 +     * @param littleEndian (optional) flag indicating whether to write in little endian order
  34.934 +     * @return undefined
  34.935 +     */
  34.936 +    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 2)
  34.937 +    public static Object setFloat64(final Object self, final Object byteOffset, final Object value, final Object littleEndian) {
  34.938 +        try {
  34.939 +            getBuffer(self, littleEndian).putDouble((int)JSType.toUint32(byteOffset), JSType.toNumber(value));
  34.940 +            return UNDEFINED;
  34.941 +        } catch (final IndexOutOfBoundsException ioe) {
  34.942 +            throw rangeError(ioe, "dataview.offset");
  34.943 +        }
  34.944 +    }
  34.945 +
  34.946 +    /**
  34.947 +     * Set 64-bit float at the given byteOffset
  34.948 +     *
  34.949 +     * @param self DataView object
  34.950 +     * @param byteOffset byte offset to write at
  34.951 +     * @param value double value to set
  34.952 +     * @return undefined
  34.953 +     */
  34.954 +    @SpecializedFunction
  34.955 +    public static Object setFloat64(final Object self, final int byteOffset, final double value) {
  34.956 +        try {
  34.957 +            getBuffer(self, false).putDouble(byteOffset, value);
  34.958 +            return UNDEFINED;
  34.959 +        } catch (final IndexOutOfBoundsException ioe) {
  34.960 +            throw rangeError(ioe, "dataview.offset");
  34.961 +        }
  34.962 +    }
  34.963 +
  34.964 +    /**
  34.965 +     * Set 64-bit float at the given byteOffset
  34.966 +     *
  34.967 +     * @param self DataView object
  34.968 +     * @param byteOffset byte offset to write at
  34.969 +     * @param value double value to set
  34.970 +     * @param littleEndian (optional) flag indicating whether to write in little endian order
  34.971 +     * @return undefined
  34.972 +     */
  34.973 +    @SpecializedFunction
  34.974 +    public static Object setFloat64(final Object self, final int byteOffset, final double value, final boolean littleEndian) {
  34.975 +        try {
  34.976 +            getBuffer(self, littleEndian).putDouble(byteOffset, value);
  34.977 +            return UNDEFINED;
  34.978 +        } catch (final IndexOutOfBoundsException ioe) {
  34.979 +            throw rangeError(ioe, "dataview.offset");
  34.980 +        }
  34.981 +    }
  34.982 +
  34.983 +    // internals only below this point
  34.984 +    private static ByteBuffer bufferFrom(final NativeArrayBuffer nab, final int offset) {
  34.985 +        try {
  34.986 +            return nab.getBuffer(offset);
  34.987 +        } catch (final IndexOutOfBoundsException ioe) {
  34.988 +            throw rangeError(ioe, "dataview.constructor.offset");
  34.989 +        }
  34.990 +    }
  34.991 +
  34.992 +    private static ByteBuffer bufferFrom(final NativeArrayBuffer nab, final int offset, final int length) {
  34.993 +        try {
  34.994 +            return nab.getBuffer(offset, length);
  34.995 +        } catch (final IndexOutOfBoundsException ioe) {
  34.996 +            throw rangeError(ioe, "dataview.constructor.offset");
  34.997 +        }
  34.998 +    }
  34.999 +
 34.1000 +    private static NativeDataView checkSelf(final Object self) {
 34.1001 +        if (!(self instanceof NativeDataView)) {
 34.1002 +            throw typeError("not.an.arraybuffer", ScriptRuntime.safeToString(self));
 34.1003 +        }
 34.1004 +        return (NativeDataView)self;
 34.1005 +    }
 34.1006 +
 34.1007 +    private static ByteBuffer getBuffer(final Object self) {
 34.1008 +        return checkSelf(self).buf;
 34.1009 +    }
 34.1010 +
 34.1011 +    private static ByteBuffer getBuffer(final Object self, final Object littleEndian) {
 34.1012 +        return getBuffer(self, JSType.toBoolean(littleEndian));
 34.1013 +    }
 34.1014 +
 34.1015 +    private static ByteBuffer getBuffer(final Object self, final boolean littleEndian) {
 34.1016 +        return getBuffer(self).order(littleEndian? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN);
 34.1017 +    }
 34.1018 +}