Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java	Wed Oct 01 12:22:12 2014 +0200
     1.2 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java	Thu Sep 25 15:53:47 2014 +0200
     1.3 @@ -292,7 +292,6 @@
     1.4              mi.push(memInfo.getArity());
     1.5              mi.invokeVirtual(SCRIPTFUNCTION_TYPE, SCRIPTFUNCTION_SETARITY, SCRIPTFUNCTION_SETARITY_DESC);
     1.6          }
     1.7 -
     1.8      }
     1.9  
    1.10      static void linkerAddGetterSetter(final MethodGenerator mi, final String className, final MemberInfo memInfo) {

     2.1 --- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java	Wed Oct 01 12:22:12 2014 +0200
     2.2 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java	Thu Sep 25 15:53:47 2014 +0200
     2.3 @@ -28,7 +28,6 @@
     2.4  import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC;
     2.5  import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTOBJECT_DESC;
     2.6  import static jdk.nashorn.internal.tools.nasgen.StringConstants.STRING_DESC;
     2.7 -
     2.8  import jdk.internal.org.objectweb.asm.Opcodes;
     2.9  import jdk.internal.org.objectweb.asm.Type;
    2.10  import jdk.nashorn.internal.objects.annotations.Where;
    2.11 @@ -75,10 +74,6 @@
    2.12           * This is a specialized version of a function
    2.13           */
    2.14          SPECIALIZED_FUNCTION,
    2.15 -        /**
    2.16 -         * This is a specialized version of a constructor
    2.17 -         */
    2.18 -        SPECIALIZED_CONSTRUCTOR
    2.19      }
    2.20  
    2.21      // keep in sync with jdk.nashorn.internal.objects.annotations.Attribute
    2.22 @@ -107,6 +102,12 @@
    2.23  
    2.24      private Where where;
    2.25  
    2.26 +    private Type linkLogicClass;
    2.27 +
    2.28 +    private boolean isSpecializedConstructor;
    2.29 +
    2.30 +    private boolean isOptimistic;
    2.31 +
    2.32      /**
    2.33       * @return the kind
    2.34       */
    2.35 @@ -136,6 +137,57 @@
    2.36      }
    2.37  
    2.38      /**
    2.39 +     * Tag something as specialized constructor or not
    2.40 +     * @param isSpecializedConstructor boolean, true if specialized constructor
    2.41 +     */
    2.42 +    public void setIsSpecializedConstructor(final boolean isSpecializedConstructor) {
    2.43 +        this.isSpecializedConstructor = isSpecializedConstructor;
    2.44 +    }
    2.45 +
    2.46 +    /**
    2.47 +     * Check if something is a specialized constructor
    2.48 +     * @return true if specialized constructor
    2.49 +     */
    2.50 +    public boolean isSpecializedConstructor() {
    2.51 +        return isSpecializedConstructor;
    2.52 +    }
    2.53 +
    2.54 +    /**
    2.55 +     * Check if this is an optimistic builtin function
    2.56 +     * @return true if optimistic builtin
    2.57 +     */
    2.58 +    public boolean isOptimistic() {
    2.59 +        return isOptimistic;
    2.60 +    }
    2.61 +
    2.62 +    /**
    2.63 +     * Tag something as optimitic builtin or not
    2.64 +     * @param isOptimistic boolean, true if builtin constructor
    2.65 +     */
    2.66 +    public void setIsOptimistic(final boolean isOptimistic) {
    2.67 +        this.isOptimistic = isOptimistic;
    2.68 +    }
    2.69 +
    2.70 +    /**
    2.71 +     * Get the SpecializedFunction guard for specializations, i.e. optimistic
    2.72 +     * builtins
    2.73 +     * @return specialization, null if none
    2.74 +     */
    2.75 +    public Type getLinkLogicClass() {
    2.76 +        return linkLogicClass;
    2.77 +    }
    2.78 +
    2.79 +    /**
    2.80 +     * Set thre SpecializedFunction link logic class for specializations, i.e. optimistic
    2.81 +     * builtins
    2.82 +     * @param linkLogicClass link logic class
    2.83 +     */
    2.84 +
    2.85 +    public void setLinkLogicClass(final Type linkLogicClass) {
    2.86 +        this.linkLogicClass = linkLogicClass;
    2.87 +    }
    2.88 +
    2.89 +    /**
    2.90       * @return the attributes
    2.91       */
    2.92      public int getAttributes() {
    2.93 @@ -304,19 +356,6 @@
    2.94                  }
    2.95              }
    2.96              break;
    2.97 -            case SPECIALIZED_CONSTRUCTOR: {
    2.98 -                final Type returnType = Type.getReturnType(javaDesc);
    2.99 -                if (!isJSObjectType(returnType)) {
   2.100 -                    error("return value of a @SpecializedConstructor method should be a valid JS type, found " + returnType);
   2.101 -                }
   2.102 -                final Type[] argTypes = Type.getArgumentTypes(javaDesc);
   2.103 -                for (int i = 0; i < argTypes.length; i++) {
   2.104 -                    if (!isValidJSType(argTypes[i])) {
   2.105 -                        error(i + "'th argument of a @SpecializedConstructor method is not valid JS type, found " + argTypes[i]);
   2.106 -                    }
   2.107 -                }
   2.108 -            }
   2.109 -            break;
   2.110              case FUNCTION: {
   2.111                  final Type returnType = Type.getReturnType(javaDesc);
   2.112                  if (!(isValidJSType(returnType) || Type.VOID_TYPE == returnType)) {
   2.113 @@ -351,7 +390,7 @@
   2.114              break;
   2.115              case SPECIALIZED_FUNCTION: {
   2.116                  final Type returnType = Type.getReturnType(javaDesc);
   2.117 -                if (!(isValidJSType(returnType) || Type.VOID_TYPE == returnType)) {
   2.118 +                if (!(isValidJSType(returnType) || (isSpecializedConstructor() && Type.VOID_TYPE == returnType))) {
   2.119                      error("return value of a @SpecializedFunction method should be a valid JS type, found " + returnType);
   2.120                  }
   2.121                  final Type[] argTypes = Type.getArgumentTypes(javaDesc);

     3.1 --- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java	Wed Oct 01 12:22:12 2014 +0200
     3.2 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java	Thu Sep 25 15:53:47 2014 +0200
     3.3 @@ -56,6 +56,7 @@
     3.4  import static jdk.internal.org.objectweb.asm.Opcodes.IALOAD;
     3.5  import static jdk.internal.org.objectweb.asm.Opcodes.IASTORE;
     3.6  import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_0;
     3.7 +import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_1;
     3.8  import static jdk.internal.org.objectweb.asm.Opcodes.ILOAD;
     3.9  import static jdk.internal.org.objectweb.asm.Opcodes.INVOKEINTERFACE;
    3.10  import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL;
    3.11 @@ -76,9 +77,11 @@
    3.12  import static jdk.internal.org.objectweb.asm.Opcodes.SASTORE;
    3.13  import static jdk.internal.org.objectweb.asm.Opcodes.SIPUSH;
    3.14  import static jdk.internal.org.objectweb.asm.Opcodes.SWAP;
    3.15 -import static jdk.nashorn.internal.tools.nasgen.StringConstants.METHODHANDLE_TYPE;
    3.16 -import static jdk.nashorn.internal.tools.nasgen.StringConstants.TYPE_METHODHANDLE;
    3.17 -
    3.18 +import static jdk.nashorn.internal.tools.nasgen.StringConstants.INIT;
    3.19 +import static jdk.nashorn.internal.tools.nasgen.StringConstants.SPECIALIZATION_INIT2;
    3.20 +import static jdk.nashorn.internal.tools.nasgen.StringConstants.SPECIALIZATION_INIT3;
    3.21 +import static jdk.nashorn.internal.tools.nasgen.StringConstants.SPECIALIZATION_TYPE;
    3.22 +import static jdk.nashorn.internal.tools.nasgen.StringConstants.TYPE_SPECIALIZATION;
    3.23  import java.util.List;
    3.24  import jdk.internal.org.objectweb.asm.Handle;
    3.25  import jdk.internal.org.objectweb.asm.MethodVisitor;
    3.26 @@ -95,6 +98,8 @@
    3.27      private final Type returnType;
    3.28      private final Type[] argumentTypes;
    3.29  
    3.30 +    static final Type EMPTY_LINK_LOGIC_TYPE = Type.getType("Ljdk/nashorn/internal/objects/annotations/SpecializedFunction$LinkLogic$Empty;");
    3.31 +
    3.32      MethodGenerator(final MethodVisitor mv, final int access, final String name, final String descriptor) {
    3.33          super(ASM4, mv);
    3.34          this.access        = access;
    3.35 @@ -380,6 +385,11 @@
    3.36          super.visitFieldInsn(GETFIELD, owner, field, desc);
    3.37      }
    3.38  
    3.39 +    private static boolean linkLogicIsEmpty(final Type type) {
    3.40 +        assert EMPTY_LINK_LOGIC_TYPE != null; //type is ok for null if we are a @SpecializedFunction without any attribs
    3.41 +        return EMPTY_LINK_LOGIC_TYPE.equals(type);
    3.42 +    }
    3.43 +
    3.44      void memberInfoArray(final String className, final List<MemberInfo> mis) {
    3.45          if (mis.isEmpty()) {
    3.46              pushNull();
    3.47 @@ -388,12 +398,22 @@
    3.48  
    3.49          int pos = 0;
    3.50          push(mis.size());
    3.51 -        newObjectArray(METHODHANDLE_TYPE);
    3.52 +        newObjectArray(SPECIALIZATION_TYPE);
    3.53          for (final MemberInfo mi : mis) {
    3.54              dup();
    3.55              push(pos++);
    3.56 +            visitTypeInsn(NEW, SPECIALIZATION_TYPE);
    3.57 +            dup();
    3.58              visitLdcInsn(new Handle(H_INVOKESTATIC, className, mi.getJavaName(), mi.getJavaDesc()));
    3.59 -            arrayStore(TYPE_METHODHANDLE);
    3.60 +            final Type    linkLogicClass = mi.getLinkLogicClass();
    3.61 +            final boolean linkLogic      = !linkLogicIsEmpty(linkLogicClass);
    3.62 +            final String  ctor           = linkLogic ? SPECIALIZATION_INIT3 : SPECIALIZATION_INIT2;
    3.63 +            if (linkLogic) {
    3.64 +                visitLdcInsn(linkLogicClass);
    3.65 +            }
    3.66 +            visitInsn(mi.isOptimistic() ? ICONST_1 : ICONST_0);
    3.67 +            visitMethodInsn(INVOKESPECIAL, SPECIALIZATION_TYPE, INIT, ctor, false);
    3.68 +            arrayStore(TYPE_SPECIALIZATION);
    3.69          }
    3.70      }
    3.71  

     4.1 --- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java	Wed Oct 01 12:22:12 2014 +0200
     4.2 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java	Thu Sep 25 15:53:47 2014 +0200
     4.3 @@ -37,7 +37,6 @@
     4.4  import jdk.nashorn.internal.objects.annotations.Property;
     4.5  import jdk.nashorn.internal.objects.annotations.ScriptClass;
     4.6  import jdk.nashorn.internal.objects.annotations.Setter;
     4.7 -import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
     4.8  import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
     4.9  import jdk.nashorn.internal.objects.annotations.Where;
    4.10  import jdk.nashorn.internal.tools.nasgen.MemberInfo.Kind;
    4.11 @@ -57,7 +56,7 @@
    4.12      static final String PROPERTY_ANNO_DESC      = Type.getDescriptor(Property.class);
    4.13      static final String WHERE_ENUM_DESC         = Type.getDescriptor(Where.class);
    4.14      static final String SPECIALIZED_FUNCTION    = Type.getDescriptor(SpecializedFunction.class);
    4.15 -    static final String SPECIALIZED_CONSTRUCTOR = Type.getDescriptor(SpecializedConstructor.class);
    4.16 +    static final String LINK_LOGIC_DESC         = "Ljdk/nashorn/internal/objects/annotations/SpecializedFunction$LinkLogic;";
    4.17  
    4.18      static final Map<String, Kind> annotations = new HashMap<>();
    4.19  
    4.20 @@ -69,7 +68,6 @@
    4.21          annotations.put(SETTER_ANNO_DESC, Kind.SETTER);
    4.22          annotations.put(PROPERTY_ANNO_DESC, Kind.PROPERTY);
    4.23          annotations.put(SPECIALIZED_FUNCTION, Kind.SPECIALIZED_FUNCTION);
    4.24 -        annotations.put(SPECIALIZED_CONSTRUCTOR, Kind.SPECIALIZED_CONSTRUCTOR);
    4.25      }
    4.26  
    4.27      // name of the script class
    4.28 @@ -119,11 +117,12 @@
    4.29      List<MemberInfo> getSpecializedConstructors() {
    4.30          final List<MemberInfo> res = new LinkedList<>();
    4.31          for (final MemberInfo memInfo : members) {
    4.32 -            if (memInfo.getKind() == Kind.SPECIALIZED_CONSTRUCTOR) {
    4.33 +            if (memInfo.isSpecializedConstructor()) {
    4.34 +                assert memInfo.getKind() == Kind.SPECIALIZED_FUNCTION;
    4.35                  res.add(memInfo);
    4.36              }
    4.37          }
    4.38 -        return res;
    4.39 +        return Collections.unmodifiableList(res);
    4.40      }
    4.41  
    4.42      int getPrototypeMemberCount() {
    4.43 @@ -175,7 +174,7 @@
    4.44                  res.add(memInfo);
    4.45              }
    4.46          }
    4.47 -        return res;
    4.48 +        return Collections.unmodifiableList(res);
    4.49      }
    4.50  
    4.51      MemberInfo findSetter(final MemberInfo getter) {

     5.1 --- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java	Wed Oct 01 12:22:12 2014 +0200
     5.2 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java	Thu Sep 25 15:53:47 2014 +0200
     5.3 @@ -27,7 +27,6 @@
     5.4  
     5.5  import static jdk.nashorn.internal.tools.nasgen.ScriptClassInfo.SCRIPT_CLASS_ANNO_DESC;
     5.6  import static jdk.nashorn.internal.tools.nasgen.ScriptClassInfo.WHERE_ENUM_DESC;
     5.7 -
     5.8  import java.io.BufferedInputStream;
     5.9  import java.io.FileInputStream;
    5.10  import java.io.IOException;
    5.11 @@ -41,6 +40,7 @@
    5.12  import jdk.internal.org.objectweb.asm.FieldVisitor;
    5.13  import jdk.internal.org.objectweb.asm.MethodVisitor;
    5.14  import jdk.internal.org.objectweb.asm.Opcodes;
    5.15 +import jdk.internal.org.objectweb.asm.Type;
    5.16  import jdk.nashorn.internal.objects.annotations.Where;
    5.17  import jdk.nashorn.internal.tools.nasgen.MemberInfo.Kind;
    5.18  
    5.19 @@ -194,6 +194,7 @@
    5.20  
    5.21                      final MemberInfo memInfo = new MemberInfo();
    5.22  
    5.23 +                    //annokind == e.g. GETTER or SPECIALIZED_FUNCTION
    5.24                      memInfo.setKind(annoKind);
    5.25                      memInfo.setJavaName(methodName);
    5.26                      memInfo.setJavaDesc(methodDesc);
    5.27 @@ -208,12 +209,18 @@
    5.28                          private Integer attributes;
    5.29                          private Integer arity;
    5.30                          private Where   where;
    5.31 +                        private boolean isSpecializedConstructor;
    5.32 +                        private boolean isOptimistic;
    5.33 +                        private Type    linkLogicClass = MethodGenerator.EMPTY_LINK_LOGIC_TYPE;
    5.34  
    5.35                          @Override
    5.36                          public void visit(final String annotationName, final Object annotationValue) {
    5.37                              switch (annotationName) {
    5.38                              case "name":
    5.39                                  this.name = (String)annotationValue;
    5.40 +                                if (name.isEmpty()) {
    5.41 +                                    name = null;
    5.42 +                                }
    5.43                                  break;
    5.44                              case "attributes":
    5.45                                  this.attributes = (Integer)annotationValue;
    5.46 @@ -221,6 +228,17 @@
    5.47                              case "arity":
    5.48                                  this.arity = (Integer)annotationValue;
    5.49                                  break;
    5.50 +                            case "isConstructor":
    5.51 +                                assert annoKind == Kind.SPECIALIZED_FUNCTION;
    5.52 +                                this.isSpecializedConstructor = (Boolean)annotationValue;
    5.53 +                                break;
    5.54 +                            case "isOptimistic":
    5.55 +                                assert annoKind == Kind.SPECIALIZED_FUNCTION;
    5.56 +                                this.isOptimistic = (Boolean)annotationValue;
    5.57 +                                break;
    5.58 +                            case "linkLogic":
    5.59 +                                this.linkLogicClass = (Type)annotationValue;
    5.60 +                                break;
    5.61                              default:
    5.62                                  break;
    5.63                              }
    5.64 @@ -230,12 +248,19 @@
    5.65  
    5.66                          @Override
    5.67                          public void visitEnum(final String enumName, final String desc, final String enumValue) {
    5.68 -                            if ("where".equals(enumName) && WHERE_ENUM_DESC.equals(desc)) {
    5.69 -                                this.where = Where.valueOf(enumValue);
    5.70 +                            switch (enumName) {
    5.71 +                            case "where":
    5.72 +                                if (WHERE_ENUM_DESC.equals(desc)) {
    5.73 +                                    this.where = Where.valueOf(enumValue);
    5.74 +                                }
    5.75 +                                break;
    5.76 +                            default:
    5.77 +                                break;
    5.78                              }
    5.79                              super.visitEnum(enumName, desc, enumValue);
    5.80                          }
    5.81  
    5.82 +                        @SuppressWarnings("fallthrough")
    5.83                          @Override
    5.84                          public void visitEnd() {
    5.85                              super.visitEnd();
    5.86 @@ -256,7 +281,6 @@
    5.87                                      case SETTER:
    5.88                                          where = Where.INSTANCE;
    5.89                                          break;
    5.90 -                                    case SPECIALIZED_CONSTRUCTOR:
    5.91                                      case CONSTRUCTOR:
    5.92                                          where = Where.CONSTRUCTOR;
    5.93                                          break;
    5.94 @@ -264,12 +288,18 @@
    5.95                                          where = Where.PROTOTYPE;
    5.96                                          break;
    5.97                                      case SPECIALIZED_FUNCTION:
    5.98 -                                        //TODO is this correct
    5.99 +                                        if (isSpecializedConstructor) {
   5.100 +                                            where = Where.CONSTRUCTOR;
   5.101 +                                        }
   5.102 +                                        //fallthru
   5.103                                      default:
   5.104                                          break;
   5.105                                  }
   5.106                              }
   5.107                              memInfo.setWhere(where);
   5.108 +                            memInfo.setLinkLogicClass(linkLogicClass);
   5.109 +                            memInfo.setIsSpecializedConstructor(isSpecializedConstructor);
   5.110 +                            memInfo.setIsOptimistic(isOptimistic);
   5.111                          }
   5.112                      };
   5.113                  }

     6.1 --- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java	Wed Oct 01 12:22:12 2014 +0200
     6.2 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java	Thu Sep 25 15:53:47 2014 +0200
     6.3 @@ -38,7 +38,6 @@
     6.4  import static jdk.nashorn.internal.tools.nasgen.StringConstants.INIT;
     6.5  import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC;
     6.6  import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTOBJECT_TYPE;
     6.7 -
     6.8  import java.io.BufferedInputStream;
     6.9  import java.io.FileInputStream;
    6.10  import java.io.FileOutputStream;

     7.1 --- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java	Wed Oct 01 12:22:12 2014 +0200
     7.2 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java	Thu Sep 25 15:53:47 2014 +0200
     7.3 @@ -37,6 +37,7 @@
     7.4  import jdk.nashorn.internal.runtime.PropertyMap;
     7.5  import jdk.nashorn.internal.runtime.ScriptFunction;
     7.6  import jdk.nashorn.internal.runtime.ScriptObject;
     7.7 +import jdk.nashorn.internal.runtime.Specialization;
     7.8  
     7.9  /**
    7.10   * String constants used for code generation/instrumentation.
    7.11 @@ -44,20 +45,26 @@
    7.12  @SuppressWarnings("javadoc")
    7.13  public interface StringConstants {
    7.14      // standard jdk types, methods
    7.15 -    static final Type TYPE_METHODHANDLE       = Type.getType(MethodHandle.class);
    7.16 -    static final Type TYPE_METHODHANDLE_ARRAY = Type.getType(MethodHandle[].class);
    7.17 -    static final Type TYPE_OBJECT             = Type.getType(Object.class);
    7.18 -    static final Type TYPE_STRING             = Type.getType(String.class);
    7.19 -    static final Type TYPE_COLLECTION         = Type.getType(Collection.class);
    7.20 -    static final Type TYPE_COLLECTIONS        = Type.getType(Collections.class);
    7.21 -    static final Type TYPE_ARRAYLIST          = Type.getType(ArrayList.class);
    7.22 -    static final Type TYPE_LIST               = Type.getType(List.class);
    7.23 +    static final Type TYPE_METHODHANDLE         = Type.getType(MethodHandle.class);
    7.24 +    static final Type TYPE_METHODHANDLE_ARRAY   = Type.getType(MethodHandle[].class);
    7.25 +    static final Type TYPE_SPECIALIZATION       = Type.getType(Specialization.class);
    7.26 +    static final Type TYPE_SPECIALIZATION_ARRAY = Type.getType(Specialization[].class);
    7.27 +    static final Type TYPE_OBJECT               = Type.getType(Object.class);
    7.28 +    static final Type TYPE_STRING               = Type.getType(String.class);
    7.29 +    static final Type TYPE_CLASS                = Type.getType(Class.class);
    7.30 +    static final Type TYPE_COLLECTION           = Type.getType(Collection.class);
    7.31 +    static final Type TYPE_COLLECTIONS          = Type.getType(Collections.class);
    7.32 +    static final Type TYPE_ARRAYLIST            = Type.getType(ArrayList.class);
    7.33 +    static final Type TYPE_LIST                 = Type.getType(List.class);
    7.34  
    7.35      static final String CLINIT = "<clinit>";
    7.36      static final String INIT = "<init>";
    7.37      static final String DEFAULT_INIT_DESC = Type.getMethodDescriptor(Type.VOID_TYPE);
    7.38  
    7.39      static final String METHODHANDLE_TYPE = TYPE_METHODHANDLE.getInternalName();
    7.40 +    static final String SPECIALIZATION_TYPE = TYPE_SPECIALIZATION.getInternalName();
    7.41 +    static final String SPECIALIZATION_INIT2 = Type.getMethodDescriptor(Type.VOID_TYPE, TYPE_METHODHANDLE, Type.getType(boolean.class));
    7.42 +    static final String SPECIALIZATION_INIT3 = Type.getMethodDescriptor(Type.VOID_TYPE, TYPE_METHODHANDLE, TYPE_CLASS, Type.getType(boolean.class));
    7.43      static final String OBJECT_TYPE = TYPE_OBJECT.getInternalName();
    7.44      static final String OBJECT_DESC = TYPE_OBJECT.getDescriptor();
    7.45      static final String STRING_TYPE = TYPE_STRING.getInternalName();
    7.46 @@ -122,11 +129,11 @@
    7.47      static final String SCRIPTFUNCTIONIMPL_MAKEFUNCTION_DESC =
    7.48          Type.getMethodDescriptor(TYPE_SCRIPTFUNCTION, TYPE_STRING, TYPE_METHODHANDLE);
    7.49      static final String SCRIPTFUNCTIONIMPL_MAKEFUNCTION_SPECS_DESC =
    7.50 -        Type.getMethodDescriptor(TYPE_SCRIPTFUNCTION, TYPE_STRING, TYPE_METHODHANDLE, TYPE_METHODHANDLE_ARRAY);
    7.51 +        Type.getMethodDescriptor(TYPE_SCRIPTFUNCTION, TYPE_STRING, TYPE_METHODHANDLE, TYPE_SPECIALIZATION_ARRAY);
    7.52      static final String SCRIPTFUNCTIONIMPL_INIT_DESC3 =
    7.53 -        Type.getMethodDescriptor(Type.VOID_TYPE, TYPE_STRING, TYPE_METHODHANDLE, TYPE_METHODHANDLE_ARRAY);
    7.54 +        Type.getMethodDescriptor(Type.VOID_TYPE, TYPE_STRING, TYPE_METHODHANDLE, TYPE_SPECIALIZATION_ARRAY);
    7.55      static final String SCRIPTFUNCTIONIMPL_INIT_DESC4 =
    7.56 -        Type.getMethodDescriptor(Type.VOID_TYPE, TYPE_STRING, TYPE_METHODHANDLE, TYPE_PROPERTYMAP, TYPE_METHODHANDLE_ARRAY);
    7.57 +        Type.getMethodDescriptor(Type.VOID_TYPE, TYPE_STRING, TYPE_METHODHANDLE, TYPE_PROPERTYMAP, TYPE_SPECIALIZATION_ARRAY);
    7.58  
    7.59      // ScriptObject
    7.60      static final String SCRIPTOBJECT_TYPE = TYPE_SCRIPTOBJECT.getInternalName();

     8.1 --- a/samples/BufferArray.java	Wed Oct 01 12:22:12 2014 +0200
     8.2 +++ b/samples/BufferArray.java	Thu Sep 25 15:53:47 2014 +0200
     8.3 @@ -29,8 +29,8 @@
     8.4   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     8.5   */
     8.6  
     8.7 +import java.nio.DoubleBuffer;
     8.8  import jdk.nashorn.api.scripting.AbstractJSObject;
     8.9 -import java.nio.DoubleBuffer;
    8.10  
    8.11  /**
    8.12   * Simple class demonstrating pluggable script object
    8.13 @@ -52,41 +52,49 @@
    8.14      // underlying nio buffer
    8.15      private final DoubleBuffer buf;
    8.16  
    8.17 -    public BufferArray(int size) {
    8.18 +    /**
    8.19 +     * Constructor
    8.20 +     * @param size initial size
    8.21 +     */
    8.22 +    public BufferArray(final int size) {
    8.23          buf = DoubleBuffer.allocate(size);
    8.24      }
    8.25  
    8.26 -    public BufferArray(DoubleBuffer buf) {
    8.27 +    /**
    8.28 +     * Constructur
    8.29 +     * @param buf {@link DoubleBuffer} to link to
    8.30 +     */
    8.31 +    public BufferArray(final DoubleBuffer buf) {
    8.32          this.buf = buf;
    8.33      }
    8.34  
    8.35      // called to check if indexed property exists
    8.36      @Override
    8.37 -    public boolean hasSlot(int index) {
    8.38 +    public boolean hasSlot(final int index) {
    8.39          return index > 0 && index < buf.capacity();
    8.40      }
    8.41  
    8.42      // get the value from that index
    8.43      @Override
    8.44 -    public Object getSlot(int index) {
    8.45 +    public Object getSlot(final int index) {
    8.46         return buf.get(index);
    8.47      }
    8.48  
    8.49      // set the value at that index
    8.50      @Override
    8.51 -    public void setSlot(int index, Object value) {
    8.52 +    public void setSlot(final int index, final Object value) {
    8.53         buf.put(index, ((Number)value).doubleValue());
    8.54      }
    8.55  
    8.56      // do you have a property of that given name?
    8.57      @Override
    8.58 -    public boolean hasMember(String name) {
    8.59 +    public boolean hasMember(final String name) {
    8.60         return "length".equals(name) || "buf".equals(name);
    8.61      }
    8.62  
    8.63      // get the value of that named property
    8.64      @Override
    8.65 -    public Object getMember(String name) {
    8.66 +    public Object getMember(final String name) {
    8.67         switch (name) {
    8.68            case "length":
    8.69                return buf.capacity();
    8.70 @@ -94,7 +102,7 @@
    8.71                // return a 'function' value for this property
    8.72                return new AbstractJSObject() {
    8.73                    @Override
    8.74 -                  public Object call(Object thiz, Object... args) {
    8.75 +                  public Object call(final Object thiz, final Object... args) {
    8.76                        return BufferArray.this.buf;
    8.77                    }
    8.78  
    8.79 @@ -104,6 +112,8 @@
    8.80                        return true;
    8.81                    }
    8.82                };
    8.83 +          default:
    8.84 +              break;
    8.85         }
    8.86         return null;
    8.87      }

     9.1 --- a/src/jdk/nashorn/internal/codegen/ApplySpecialization.java	Wed Oct 01 12:22:12 2014 +0200
     9.2 +++ b/src/jdk/nashorn/internal/codegen/ApplySpecialization.java	Thu Sep 25 15:53:47 2014 +0200
     9.3 @@ -27,7 +27,6 @@
     9.4  
     9.5  import static jdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS_VAR;
     9.6  import static jdk.nashorn.internal.codegen.CompilerConstants.EXPLODED_ARGUMENT_PREFIX;
     9.7 -
     9.8  import java.lang.invoke.MethodType;
     9.9  import java.util.ArrayDeque;
    9.10  import java.util.ArrayList;
    9.11 @@ -35,7 +34,6 @@
    9.12  import java.util.HashSet;
    9.13  import java.util.List;
    9.14  import java.util.Set;
    9.15 -
    9.16  import jdk.nashorn.internal.ir.AccessNode;
    9.17  import jdk.nashorn.internal.ir.CallNode;
    9.18  import jdk.nashorn.internal.ir.Expression;
    9.19 @@ -131,11 +129,12 @@
    9.20          @SuppressWarnings("serial")
    9.21          final UnsupportedOperationException uoe = new UnsupportedOperationException() {
    9.22              @Override
    9.23 -            public Throwable fillInStackTrace() {
    9.24 +            public synchronized Throwable fillInStackTrace() {
    9.25                  return null;
    9.26              }
    9.27          };
    9.28  
    9.29 +        final Set<Expression> argumentsFound = new HashSet<>();
    9.30          final Deque<Set<Expression>> stack = new ArrayDeque<>();
    9.31          //ensure that arguments is only passed as arg to apply
    9.32          try {
    9.33 @@ -145,7 +144,11 @@
    9.34                  }
    9.35  
    9.36                  private boolean isArguments(final Expression expr) {
    9.37 -                    return expr instanceof IdentNode && ARGUMENTS.equals(((IdentNode)expr).getName());
    9.38 +                    if (expr instanceof IdentNode && ARGUMENTS.equals(((IdentNode)expr).getName())) {
    9.39 +                        argumentsFound.add(expr);
    9.40 +                        return true;
    9.41 +                    }
    9.42 +                    return false;
    9.43                  }
    9.44  
    9.45                  private boolean isParam(final String name) {
    9.46 @@ -159,7 +162,7 @@
    9.47  
    9.48                  @Override
    9.49                  public Node leaveIdentNode(final IdentNode identNode) {
    9.50 -                    if (isParam(identNode.getName()) || ARGUMENTS.equals(identNode.getName()) && !isCurrentArg(identNode)) {
    9.51 +                    if (isParam(identNode.getName()) || isArguments(identNode) && !isCurrentArg(identNode)) {
    9.52                          throw uoe; //avoid filling in stack trace
    9.53                      }
    9.54                      return identNode;
    9.55 @@ -186,7 +189,9 @@
    9.56                  }
    9.57              });
    9.58          } catch (final UnsupportedOperationException e) {
    9.59 -            log.fine("'arguments' escapes, is not used in standard call dispatch, or is reassigned in '" + functionNode.getName() + "'. Aborting");
    9.60 +            if (!argumentsFound.isEmpty()) {
    9.61 +                log.fine("'arguments' is used but escapes, or is reassigned in '" + functionNode.getName() + "'. Aborting");
    9.62 +            }
    9.63              return true; //bad
    9.64          }
    9.65  
    9.66 @@ -267,9 +272,9 @@
    9.67              return false;
    9.68          }
    9.69  
    9.70 -        if (!Global.instance().isSpecialNameValid("apply")) {
    9.71 +        if (!Global.isBuiltinFunctionPrototypeApply()) {
    9.72              log.fine("Apply transform disabled: apply/call overridden");
    9.73 -            assert !Global.instance().isSpecialNameValid("call") : "call and apply should have the same SwitchPoint";
    9.74 +            assert !Global.isBuiltinFunctionPrototypeCall() : "call and apply should have the same SwitchPoint";
    9.75              return false;
    9.76          }
    9.77  

    10.1 --- a/src/jdk/nashorn/internal/codegen/ClassEmitter.java	Wed Oct 01 12:22:12 2014 +0200
    10.2 +++ b/src/jdk/nashorn/internal/codegen/ClassEmitter.java	Thu Sep 25 15:53:47 2014 +0200
    10.3 @@ -51,15 +51,14 @@
    10.4  import static jdk.nashorn.internal.codegen.CompilerConstants.methodDescriptor;
    10.5  import static jdk.nashorn.internal.codegen.CompilerConstants.typeDescriptor;
    10.6  import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
    10.7 -
    10.8  import java.io.ByteArrayOutputStream;
    10.9  import java.io.PrintWriter;
   10.10  import java.security.AccessController;
   10.11  import java.security.PrivilegedAction;
   10.12 +import java.util.Collections;
   10.13  import java.util.EnumSet;
   10.14  import java.util.HashSet;
   10.15  import java.util.Set;
   10.16 -
   10.17  import jdk.internal.org.objectweb.asm.ClassWriter;
   10.18  import jdk.internal.org.objectweb.asm.MethodVisitor;
   10.19  import jdk.internal.org.objectweb.asm.util.TraceClassVisitor;
   10.20 @@ -160,8 +159,12 @@
   10.21          this.methodNames    = new HashSet<>();
   10.22      }
   10.23  
   10.24 +    /**
   10.25 +     * Return the method names encountered
   10.26 +     * @return method names
   10.27 +     */
   10.28      public Set<String> getMethodNames() {
   10.29 -        return methodNames;
   10.30 +        return Collections.unmodifiableSet(methodNames);
   10.31      }
   10.32  
   10.33      /**

    11.1 --- a/src/jdk/nashorn/internal/codegen/CompilationPhase.java	Wed Oct 01 12:22:12 2014 +0200
    11.2 +++ b/src/jdk/nashorn/internal/codegen/CompilationPhase.java	Thu Sep 25 15:53:47 2014 +0200
    11.3 @@ -38,7 +38,6 @@
    11.4  import static jdk.nashorn.internal.ir.FunctionNode.CompilationState.SPLIT;
    11.5  import static jdk.nashorn.internal.ir.FunctionNode.CompilationState.SYMBOLS_ASSIGNED;
    11.6  import static jdk.nashorn.internal.runtime.logging.DebugLogger.quote;
    11.7 -
    11.8  import java.io.PrintWriter;
    11.9  import java.util.ArrayList;
   11.10  import java.util.EnumSet;
   11.11 @@ -48,7 +47,6 @@
   11.12  import java.util.Map;
   11.13  import java.util.Map.Entry;
   11.14  import java.util.Set;
   11.15 -
   11.16  import jdk.nashorn.internal.AssertsEnabled;
   11.17  import jdk.nashorn.internal.codegen.Compiler.CompilationPhases;
   11.18  import jdk.nashorn.internal.ir.FunctionNode;
   11.19 @@ -627,7 +625,7 @@
   11.20  
   11.21      /**
   11.22       * Start a compilation phase
   11.23 -     * @param compiler
   11.24 +     * @param compiler the compiler to use
   11.25       * @param functionNode function to compile
   11.26       * @return function node
   11.27       */

    12.1 --- a/src/jdk/nashorn/internal/codegen/CompileUnit.java	Wed Oct 01 12:22:12 2014 +0200
    12.2 +++ b/src/jdk/nashorn/internal/codegen/CompileUnit.java	Thu Sep 25 15:53:47 2014 +0200
    12.3 @@ -60,6 +60,10 @@
    12.4          emittedUnitCount++;
    12.5      }
    12.6  
    12.7 +    /**
    12.8 +     * Get the amount of emitted compile units so far in the system
    12.9 +     * @return emitted compile unit count
   12.10 +     */
   12.11      public static int getEmittedUnitCount() {
   12.12          return emittedUnitCount;
   12.13      }
   12.14 @@ -72,6 +76,10 @@
   12.15          return isUsed;
   12.16      }
   12.17  
   12.18 +    /**
   12.19 +     * Check if a compile unit has code, not counting inits and clinits
   12.20 +     * @return true of if there is "real code" in the compile unit
   12.21 +     */
   12.22      public boolean hasCode() {
   12.23          return (classEmitter.getMethodCount() - classEmitter.getInitCount() - classEmitter.getClinitCount()) > 0;
   12.24      }

    13.1 --- a/src/jdk/nashorn/internal/codegen/MethodEmitter.java	Wed Oct 01 12:22:12 2014 +0200
    13.2 +++ b/src/jdk/nashorn/internal/codegen/MethodEmitter.java	Thu Sep 25 15:53:47 2014 +0200
    13.3 @@ -71,7 +71,6 @@
    13.4  import static jdk.nashorn.internal.codegen.ObjectClassGenerator.PRIMITIVE_FIELD_TYPE;
    13.5  import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_OPTIMISTIC;
    13.6  import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_PROGRAM_POINT_SHIFT;
    13.7 -
    13.8  import java.io.PrintStream;
    13.9  import java.lang.reflect.Array;
   13.10  import java.util.Collection;
   13.11 @@ -107,6 +106,7 @@
   13.12  import jdk.nashorn.internal.runtime.RewriteException;
   13.13  import jdk.nashorn.internal.runtime.Scope;
   13.14  import jdk.nashorn.internal.runtime.ScriptObject;
   13.15 +import jdk.nashorn.internal.runtime.ScriptRuntime;
   13.16  import jdk.nashorn.internal.runtime.UnwarrantedOptimismException;
   13.17  import jdk.nashorn.internal.runtime.linker.Bootstrap;
   13.18  import jdk.nashorn.internal.runtime.logging.DebugLogger;
   13.19 @@ -181,9 +181,6 @@
   13.20      /** Bootstrap for array populators */
   13.21      private static final Handle POPULATE_ARRAY_BOOTSTRAP = new Handle(H_INVOKESTATIC, RewriteException.BOOTSTRAP.className(), RewriteException.BOOTSTRAP.name(), RewriteException.BOOTSTRAP.descriptor());
   13.22  
   13.23 -    /** Bootstrap for global name invalidation */
   13.24 -    private static final Handle INVALIDATE_NAME_BOOTSTRAP = new Handle(H_INVOKESTATIC, Global.BOOTSTRAP.className(), Global.BOOTSTRAP.name(), Global.BOOTSTRAP.descriptor());
   13.25 -
   13.26      /**
   13.27       * Constructor - internal use from ClassEmitter only
   13.28       * @see ClassEmitter#method
   13.29 @@ -2140,10 +2137,15 @@
   13.30      }
   13.31  
   13.32      MethodEmitter invalidateSpecialName(final String name) {
   13.33 -        //this is a nop if the global hasn't registered this as a special name - we can just ignore it
   13.34 -        if (Global.instance().isSpecialName(name)) {
   13.35 -            debug("dynamic_invalidate_name", "name=", name);
   13.36 -            method.visitInvokeDynamicInsn(name, "()V", INVALIDATE_NAME_BOOTSTRAP);
   13.37 +        switch (name) {
   13.38 +        case "apply":
   13.39 +        case "call":
   13.40 +            debug("invalidate_name", "name=", name);
   13.41 +            load("Function");
   13.42 +            invoke(ScriptRuntime.INVALIDATE_RESERVED_BUILTIN_NAME);
   13.43 +            break;
   13.44 +        default:
   13.45 +            break;
   13.46          }
   13.47          return this;
   13.48      }

    14.1 --- a/src/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java	Wed Oct 01 12:22:12 2014 +0200
    14.2 +++ b/src/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java	Thu Sep 25 15:53:47 2014 +0200
    14.3 @@ -429,7 +429,6 @@
    14.4      }
    14.5  
    14.6      private static void doCleanup() throws IOException {
    14.7 -        final long start = System.nanoTime();
    14.8          final Path[] files = getAllRegularFilesInLastModifiedOrder();
    14.9          final int nFiles = files.length;
   14.10          final int filesToDelete = Math.max(0, nFiles - MAX_FILES);
   14.11 @@ -444,8 +443,7 @@
   14.12                  // does not increase filesDeleted
   14.13              }
   14.14              files[i] = null; // gc eligible
   14.15 -        };
   14.16 -        final long duration = System.nanoTime() - start;
   14.17 +        }
   14.18      }
   14.19  
   14.20      private static Path[] getAllRegularFilesInLastModifiedOrder() throws IOException {
   14.21 @@ -456,7 +454,7 @@
   14.22                  @Override
   14.23                  public boolean test(final Path path) {
   14.24                      return !Files.isDirectory(path);
   14.25 -                };
   14.26 +                }
   14.27              })
   14.28              .map(new Function<Path, PathAndTime>() {
   14.29                  @Override
   14.30 @@ -497,7 +495,7 @@
   14.31          private static long getTime(final Path path) {
   14.32              try {
   14.33                  return Files.getLastModifiedTime(path).toMillis();
   14.34 -            } catch (IOException e) {
   14.35 +            } catch (final IOException e) {
   14.36                  // All files for which we can't retrieve the last modified date will be considered oldest.
   14.37                  return -1L;
   14.38              }

    15.1 --- a/src/jdk/nashorn/internal/codegen/types/Type.java	Wed Oct 01 12:22:12 2014 +0200
    15.2 +++ b/src/jdk/nashorn/internal/codegen/types/Type.java	Thu Sep 25 15:53:47 2014 +0200
    15.3 @@ -47,7 +47,6 @@
    15.4  import static jdk.internal.org.objectweb.asm.Opcodes.T_INT;
    15.5  import static jdk.internal.org.objectweb.asm.Opcodes.T_LONG;
    15.6  import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
    15.7 -
    15.8  import java.io.DataInput;
    15.9  import java.io.DataOutput;
   15.10  import java.io.IOException;
   15.11 @@ -299,7 +298,7 @@
   15.12       *
   15.13       * @param typeMap the type map
   15.14       * @param output data output
   15.15 -     * @throws IOException
   15.16 +     * @throws IOException if write cannot be completed
   15.17       */
   15.18      public static void writeTypeMap(final Map<Integer, Type> typeMap, final DataOutput output) throws IOException {
   15.19          if (typeMap == null) {
   15.20 @@ -329,7 +328,7 @@
   15.21       *
   15.22       * @param input data input
   15.23       * @return type map
   15.24 -     * @throws IOException
   15.25 +     * @throws IOException if read cannot be completed
   15.26       */
   15.27      public static Map<Integer, Type> readTypeMap(final DataInput input) throws IOException {
   15.28          final int size = input.readInt();

    16.1 --- a/src/jdk/nashorn/internal/ir/FunctionNode.java	Wed Oct 01 12:22:12 2014 +0200
    16.2 +++ b/src/jdk/nashorn/internal/ir/FunctionNode.java	Thu Sep 25 15:53:47 2014 +0200
    16.3 @@ -238,17 +238,21 @@
    16.4       * Note that even IS_STRICT is one such flag but that requires special handling.
    16.5       */
    16.6  
    16.7 -    // parser, lower debugging this function
    16.8 +    /** parser, print parse tree */
    16.9      public static final int IS_PRINT_PARSE       = 1 << 18;
   16.10 +    /** parser, print lower parse tree */
   16.11      public static final int IS_PRINT_LOWER_PARSE = 1 << 19;
   16.12 +    /** parser, print AST */
   16.13      public static final int IS_PRINT_AST         = 1 << 20;
   16.14 +    /** parser, print lower AST */
   16.15      public static final int IS_PRINT_LOWER_AST   = 1 << 21;
   16.16 +    /** parser, print symbols */
   16.17      public static final int IS_PRINT_SYMBOLS     = 1 << 22;
   16.18  
   16.19 +    // callsite tracing, profiling within this function
   16.20      /** profile callsites in this function? */
   16.21      public static final int IS_PROFILE         = 1 << 23;
   16.22  
   16.23 -    // callsite tracing, profiling within this function
   16.24      /** trace callsite enterexit in this function? */
   16.25      public static final int IS_TRACE_ENTEREXIT = 1 << 24;
   16.26  
   16.27 @@ -337,7 +341,7 @@
   16.28      private FunctionNode(
   16.29          final FunctionNode functionNode,
   16.30          final long lastToken,
   16.31 -        Object endParserState,
   16.32 +        final Object endParserState,
   16.33          final int flags,
   16.34          final String name,
   16.35          final Type returnType,

    17.1 --- a/src/jdk/nashorn/internal/ir/LiteralNode.java	Wed Oct 01 12:22:12 2014 +0200
    17.2 +++ b/src/jdk/nashorn/internal/ir/LiteralNode.java	Thu Sep 25 15:53:47 2014 +0200
    17.3 @@ -237,6 +237,10 @@
    17.4          return value;
    17.5      }
    17.6  
    17.7 +    private static Expression[] valueToArray(final List<Expression> value) {
    17.8 +        return value.toArray(new Expression[value.size()]);
    17.9 +    }
   17.10 +
   17.11      /**
   17.12       * Create a new null literal
   17.13       *
   17.14 @@ -981,10 +985,9 @@
   17.15       * @return the new literal node
   17.16       */
   17.17      public static LiteralNode<Expression[]> newInstance(final long token, final int finish, final List<Expression> value) {
   17.18 -        return new ArrayLiteralNode(token, finish, value.toArray(new Expression[value.size()]));
   17.19 +        return new ArrayLiteralNode(token, finish, valueToArray(value));
   17.20      }
   17.21  
   17.22 -
   17.23      /**
   17.24       * Create a new array literal based on a parent node (source, token, finish)
   17.25       *
   17.26 @@ -994,7 +997,7 @@
   17.27       * @return the new literal node
   17.28       */
   17.29      public static LiteralNode<?> newInstance(final Node parent, final List<Expression> value) {
   17.30 -        return new ArrayLiteralNode(parent.getToken(), parent.getFinish(), value.toArray(new Expression[value.size()]));
   17.31 +        return new ArrayLiteralNode(parent.getToken(), parent.getFinish(), valueToArray(value));
   17.32      }
   17.33  
   17.34      /**

    18.1 --- a/src/jdk/nashorn/internal/ir/Symbol.java	Wed Oct 01 12:22:12 2014 +0200
    18.2 +++ b/src/jdk/nashorn/internal/ir/Symbol.java	Thu Sep 25 15:53:47 2014 +0200
    18.3 @@ -448,14 +448,25 @@
    18.4          return (flags & IS_FUNCTION_SELF) != 0;
    18.5      }
    18.6  
    18.7 +    /**
    18.8 +     * Is this a block scoped symbol
    18.9 +     * @return true if block scoped
   18.10 +     */
   18.11      public boolean isBlockScoped() {
   18.12          return isLet() || isConst();
   18.13      }
   18.14  
   18.15 +    /**
   18.16 +     * Has this symbol been declared
   18.17 +     * @return true if declared
   18.18 +     */
   18.19      public boolean hasBeenDeclared() {
   18.20          return (flags & HAS_BEEN_DECLARED) != 0;
   18.21      }
   18.22  
   18.23 +    /**
   18.24 +     * Mark this symbol as declared
   18.25 +     */
   18.26      public void setHasBeenDeclared() {
   18.27          if (!hasBeenDeclared()) {
   18.28              flags |= HAS_BEEN_DECLARED;

    19.1 --- a/src/jdk/nashorn/internal/lookup/MethodHandleFactory.java	Wed Oct 01 12:22:12 2014 +0200
    19.2 +++ b/src/jdk/nashorn/internal/lookup/MethodHandleFactory.java	Thu Sep 25 15:53:47 2014 +0200
    19.3 @@ -116,6 +116,10 @@
    19.4  
    19.5      private static final String VOID_TAG = "[VOID]";
    19.6  
    19.7 +    private static void err(final String str) {
    19.8 +        Context.getContext().getErr().println(str);
    19.9 +    }
   19.10 +
   19.11      /**
   19.12       * Tracer that is applied before a value is returned from the traced function. It will output the return
   19.13       * value and its class
   19.14 @@ -124,13 +128,16 @@
   19.15       * @return return value unmodified
   19.16       */
   19.17      static Object traceReturn(final DebugLogger logger, final Object value) {
   19.18 -        if (logger.isEnabled()) {
   19.19 -            final String str = "    return" +
   19.20 -                    (VOID_TAG.equals(value) ?
   19.21 -                        ";" :
   19.22 -                        " " + stripName(value) + "; // [type=" + (value == null ? "null]" : stripName(value.getClass()) + ']'));
   19.23 +        final String str = "    return" +
   19.24 +                (VOID_TAG.equals(value) ?
   19.25 +                    ";" :
   19.26 +                    " " + stripName(value) + "; // [type=" + (value == null ? "null]" : stripName(value.getClass()) + ']'));
   19.27 +        if (logger == null) {
   19.28 +            err(str);
   19.29 +        } else if (logger.isEnabled()) {
   19.30              logger.log(TRACE_LEVEL, str);
   19.31          }
   19.32 +
   19.33          return value;
   19.34      }
   19.35  
   19.36 @@ -169,8 +176,11 @@
   19.37              }
   19.38          }
   19.39  
   19.40 -        assert logger != null;
   19.41 -        logger.log(TRACE_LEVEL, sb);
   19.42 +        if (logger == null) {
   19.43 +            err(sb.toString());
   19.44 +        } else {
   19.45 +            logger.log(TRACE_LEVEL, sb);
   19.46 +        }
   19.47          stacktrace(logger);
   19.48      }
   19.49  
   19.50 @@ -181,7 +191,12 @@
   19.51          final ByteArrayOutputStream baos = new ByteArrayOutputStream();
   19.52          final PrintStream ps = new PrintStream(baos);
   19.53          new Throwable().printStackTrace(ps);
   19.54 -        logger.log(TRACE_LEVEL, baos.toString());
   19.55 +        final String st = baos.toString();
   19.56 +        if (logger == null) {
   19.57 +            err(st);
   19.58 +        } else {
   19.59 +            logger.log(TRACE_LEVEL, st);
   19.60 +        }
   19.61      }
   19.62  
   19.63      private static String argString(final Object arg) {
   19.64 @@ -201,7 +216,7 @@
   19.65          if (arg instanceof ScriptObject) {
   19.66              return arg.toString() +
   19.67                  " (map=" + Debug.id(((ScriptObject)arg).getMap()) +
   19.68 -                ")";
   19.69 +                ')';
   19.70          }
   19.71  
   19.72          return arg.toString();
   19.73 @@ -209,6 +224,18 @@
   19.74  
   19.75      /**
   19.76       * Add a debug printout to a method handle, tracing parameters and return values
   19.77 +     * Output will be unconditional to stderr
   19.78 +     *
   19.79 +     * @param mh  method handle to trace
   19.80 +     * @param tag start of trace message
   19.81 +     * @return traced method handle
   19.82 +     */
   19.83 +    public static MethodHandle addDebugPrintout(final MethodHandle mh, final Object tag) {
   19.84 +        return addDebugPrintout(null, Level.OFF, mh, 0, true, tag);
   19.85 +    }
   19.86 +
   19.87 +    /**
   19.88 +     * Add a debug printout to a method handle, tracing parameters and return values
   19.89       *
   19.90       * @param logger a specific logger to which to write the output
   19.91       * @param level level over which to print
   19.92 @@ -222,6 +249,20 @@
   19.93  
   19.94      /**
   19.95       * Add a debug printout to a method handle, tracing parameters and return values
   19.96 +     * Output will be unconditional to stderr
   19.97 +     *
   19.98 +     * @param mh  method handle to trace
   19.99 +     * @param paramStart first param to print/trace
  19.100 +     * @param printReturnValue should we print/trace return value if available?
  19.101 +     * @param tag start of trace message
  19.102 +     * @return  traced method handle
  19.103 +     */
  19.104 +    public static MethodHandle addDebugPrintout(final MethodHandle mh, final int paramStart, final boolean printReturnValue, final Object tag) {
  19.105 +        return addDebugPrintout(null, Level.OFF, mh, paramStart, printReturnValue, tag);
  19.106 +    }
  19.107 +
  19.108 +     /**
  19.109 +     * Add a debug printout to a method handle, tracing parameters and return values
  19.110       *
  19.111       * @param logger a specific logger to which to write the output
  19.112       * @param level level over which to print
  19.113 @@ -240,7 +281,6 @@
  19.114              return mh;
  19.115          }
  19.116  
  19.117 -        assert logger != null;
  19.118          assert TRACE != null;
  19.119  
  19.120          MethodHandle trace = MethodHandles.insertArguments(TRACE, 0, logger, tag, paramStart);
  19.121 @@ -428,6 +468,12 @@
  19.122          }
  19.123  
  19.124          @Override
  19.125 +        public MethodHandle identity(final Class<?> type) {
  19.126 +            final MethodHandle mh = MethodHandles.identity(type);
  19.127 +            return debug(mh, "identity", type);
  19.128 +        }
  19.129 +
  19.130 +        @Override
  19.131          public MethodHandle asCollector(final MethodHandle handle, final Class<?> arrayType, final int arrayLength) {
  19.132              final MethodHandle mh = handle.asCollector(arrayType, arrayLength);
  19.133              return debug(mh, "asCollector", handle, arrayType, arrayLength);

    20.1 --- a/src/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java	Wed Oct 01 12:22:12 2014 +0200
    20.2 +++ b/src/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java	Thu Sep 25 15:53:47 2014 +0200
    20.3 @@ -173,6 +173,15 @@
    20.4      public MethodHandle constant(Class<?> type, Object value);
    20.5  
    20.6      /**
    20.7 +     * Wrapper for {@link java.lang.invoke.MethodHandles#identity(Class)}
    20.8 +     *
    20.9 +     * @param type  type of value
   20.10 +     *
   20.11 +     * @return method handle that returns identity argument
   20.12 +     */
   20.13 +    public MethodHandle identity(Class<?> type);
   20.14 +
   20.15 +    /**
   20.16       * Wrapper for {@link java.lang.invoke.MethodHandle#asType(MethodType)}
   20.17       *
   20.18       * @param handle  method handle for type conversion

    21.1 --- a/src/jdk/nashorn/internal/objects/ArrayBufferView.java	Wed Oct 01 12:22:12 2014 +0200
    21.2 +++ b/src/jdk/nashorn/internal/objects/ArrayBufferView.java	Thu Sep 25 15:53:47 2014 +0200
    21.3 @@ -31,6 +31,7 @@
    21.4  
    21.5  import java.nio.ByteBuffer;
    21.6  import java.nio.ByteOrder;
    21.7 +
    21.8  import jdk.internal.dynalink.CallSiteDescriptor;
    21.9  import jdk.internal.dynalink.linker.GuardedInvocation;
   21.10  import jdk.internal.dynalink.linker.LinkRequest;

    22.1 --- a/src/jdk/nashorn/internal/objects/Global.java	Wed Oct 01 12:22:12 2014 +0200
    22.2 +++ b/src/jdk/nashorn/internal/objects/Global.java	Thu Sep 25 15:53:47 2014 +0200
    22.3 @@ -25,23 +25,19 @@
    22.4  
    22.5  package jdk.nashorn.internal.objects;
    22.6  
    22.7 -import static jdk.nashorn.internal.codegen.CompilerConstants.staticCall;
    22.8  import static jdk.nashorn.internal.lookup.Lookup.MH;
    22.9  import static jdk.nashorn.internal.runtime.ECMAErrors.referenceError;
   22.10  import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
   22.11  import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
   22.12 -
   22.13  import java.io.IOException;
   22.14  import java.io.PrintWriter;
   22.15 -import java.lang.invoke.CallSite;
   22.16 -import java.lang.invoke.ConstantCallSite;
   22.17  import java.lang.invoke.MethodHandle;
   22.18  import java.lang.invoke.MethodHandles;
   22.19 -import java.lang.invoke.MethodType;
   22.20  import java.lang.invoke.SwitchPoint;
   22.21  import java.lang.reflect.Field;
   22.22 +import java.util.ArrayList;
   22.23  import java.util.Arrays;
   22.24 -import java.util.HashMap;
   22.25 +import java.util.List;
   22.26  import java.util.Map;
   22.27  import java.util.concurrent.Callable;
   22.28  import java.util.concurrent.ConcurrentHashMap;
   22.29 @@ -52,8 +48,6 @@
   22.30  import jdk.internal.dynalink.linker.LinkRequest;
   22.31  import jdk.nashorn.api.scripting.ClassFilter;
   22.32  import jdk.nashorn.api.scripting.ScriptObjectMirror;
   22.33 -import jdk.nashorn.internal.codegen.ApplySpecialization;
   22.34 -import jdk.nashorn.internal.codegen.CompilerConstants.Call;
   22.35  import jdk.nashorn.internal.lookup.Lookup;
   22.36  import jdk.nashorn.internal.objects.annotations.Attribute;
   22.37  import jdk.nashorn.internal.objects.annotations.Property;
   22.38 @@ -72,6 +66,7 @@
   22.39  import jdk.nashorn.internal.runtime.ScriptObject;
   22.40  import jdk.nashorn.internal.runtime.ScriptRuntime;
   22.41  import jdk.nashorn.internal.runtime.ScriptingFunctions;
   22.42 +import jdk.nashorn.internal.runtime.Specialization;
   22.43  import jdk.nashorn.internal.runtime.arrays.ArrayData;
   22.44  import jdk.nashorn.internal.runtime.linker.Bootstrap;
   22.45  import jdk.nashorn.internal.runtime.linker.InvokeByName;
   22.46 @@ -107,10 +102,6 @@
   22.47       * it's when you start adding property checks for said builtins you have
   22.48       * problems with guard speed.
   22.49       */
   22.50 -    public final Map<String, SwitchPoint> optimisticFunctionMap;
   22.51 -
   22.52 -    /** Name invalidator for things like call/apply */
   22.53 -    public static final Call BOOTSTRAP = staticCall(MethodHandles.lookup(), Global.class, "invalidateNameBootstrap", CallSite.class, MethodHandles.Lookup.class, String.class, MethodType.class);
   22.54  
   22.55      /** Nashorn extension: arguments array */
   22.56      @Property(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE)
   22.57 @@ -428,9 +419,6 @@
   22.58      private static final MethodHandle LOADWITHNEWGLOBAL = findOwnMH_S("loadWithNewGlobal",   Object.class, Object.class, Object[].class);
   22.59      private static final MethodHandle EXIT              = findOwnMH_S("exit",                Object.class, Object.class, Object.class);
   22.60  
   22.61 -    /** Invalidate a reserved name, such as "apply" or "call" if assigned */
   22.62 -    public MethodHandle INVALIDATE_RESERVED_NAME = MH.bindTo(findOwnMH_V("invalidateReservedName", void.class, String.class), this);
   22.63 -
   22.64      // initialized by nasgen
   22.65      private static PropertyMap $nasgenmap$;
   22.66  
   22.67 @@ -482,7 +470,6 @@
   22.68          super(checkAndGetMap(context));
   22.69          this.context = context;
   22.70          this.setIsScope();
   22.71 -        this.optimisticFunctionMap = new HashMap<>();
   22.72          //we can only share one instance of Global constants between globals, or we consume way too much
   22.73          //memory - this is good enough for most programs
   22.74          while (gcsInstance.get() == null) {
   22.75 @@ -574,6 +561,7 @@
   22.76       *
   22.77       * @param engine ScriptEngine to initialize
   22.78       */
   22.79 +    @SuppressWarnings("hiding")
   22.80      public void initBuiltinObjects(final ScriptEngine engine) {
   22.81          if (this.builtinObject != null) {
   22.82              // already initialized, just return
   22.83 @@ -918,10 +906,12 @@
   22.84          }
   22.85  
   22.86          switch (nameStr) {
   22.87 -            case "context":
   22.88 -                return sctxt;
   22.89 -            case "engine":
   22.90 -                return global.engine;
   22.91 +        case "context":
   22.92 +            return sctxt;
   22.93 +        case "engine":
   22.94 +            return global.engine;
   22.95 +        default:
   22.96 +            break;
   22.97          }
   22.98  
   22.99          if (self == UNDEFINED) {
  22.100 @@ -1244,6 +1234,40 @@
  22.101          return instance.function == instance.getBuiltinFunction();
  22.102      }
  22.103  
  22.104 +    /**
  22.105 +     * Get the switchpoint used to check property changes for Function.prototype.apply
  22.106 +     * @return the switchpoint guarding apply (same as guarding call, and everything else in function)
  22.107 +     */
  22.108 +    public static SwitchPoint getBuiltinFunctionApplySwitchPoint() {
  22.109 +        return ScriptFunction.getPrototype(Global.instance().getBuiltinFunction()).getProperty("apply").getBuiltinSwitchPoint();
  22.110 +    }
  22.111 +
  22.112 +    private static boolean isBuiltinFunctionProperty(final String name) {
  22.113 +        final Global instance = Global.instance();
  22.114 +        final ScriptFunction builtinFunction = instance.getBuiltinFunction();
  22.115 +        if (builtinFunction == null) {
  22.116 +            return false; //conservative for compile-only mode
  22.117 +        }
  22.118 +        final boolean isBuiltinFunction = instance.function == builtinFunction;
  22.119 +        return isBuiltinFunction && ScriptFunction.getPrototype(builtinFunction).getProperty(name).isBuiltin();
  22.120 +    }
  22.121 +
  22.122 +    /**
  22.123 +     * Check if the Function.prototype.apply has not been replaced
  22.124 +     * @return true if Function.prototype.apply has been replaced
  22.125 +     */
  22.126 +    public static boolean isBuiltinFunctionPrototypeApply() {
  22.127 +        return isBuiltinFunctionProperty("apply");
  22.128 +    }
  22.129 +
  22.130 +    /**
  22.131 +     * Check if the Function.prototype.apply has not been replaced
  22.132 +     * @return true if Function.prototype.call has been replaced
  22.133 +     */
  22.134 +    public static boolean isBuiltinFunctionPrototypeCall() {
  22.135 +        return isBuiltinFunctionProperty("call");
  22.136 +    }
  22.137 +
  22.138      private ScriptFunction getBuiltinJSAdapter() {
  22.139          return builtinJSAdapter;
  22.140      }
  22.141 @@ -1688,6 +1712,13 @@
  22.142          splitState = state;
  22.143      }
  22.144  
  22.145 +    private <T extends ScriptObject> T initConstructorAndSwitchPoint(final String name, final Class<T> clazz) {
  22.146 +        final T func = initConstructor(name, clazz);
  22.147 +        tagBuiltinProperties(name, func);
  22.148 +        return func;
  22.149 +    }
  22.150 +
  22.151 +    @SuppressWarnings("hiding")
  22.152      private void init(final ScriptEngine engine) {
  22.153          assert Context.getGlobal() == this : "this global is not set as current";
  22.154  
  22.155 @@ -1702,8 +1733,19 @@
  22.156          // initialize global function properties
  22.157          this.eval = this.builtinEval = ScriptFunctionImpl.makeFunction("eval", EVAL);
  22.158  
  22.159 -        this.parseInt           = ScriptFunctionImpl.makeFunction("parseInt",   GlobalFunctions.PARSEINT,
  22.160 -                new MethodHandle[] { GlobalFunctions.PARSEINT_OI, GlobalFunctions.PARSEINT_O });
  22.161 +        this.parseInt = ScriptFunctionImpl.makeFunction("parseInt",   GlobalFunctions.PARSEINT,
  22.162 +                    new Specialization[] {
  22.163 +                    new Specialization(GlobalFunctions.PARSEINT_Z),
  22.164 +                    new Specialization(GlobalFunctions.PARSEINT_I),
  22.165 +                    new Specialization(GlobalFunctions.PARSEINT_J),
  22.166 +                    new Specialization(GlobalFunctions.PARSEINT_OI),
  22.167 +                    new Specialization(GlobalFunctions.PARSEINT_O) });
  22.168 +        this.parseFloat = ScriptFunctionImpl.makeFunction("parseFloat", GlobalFunctions.PARSEFLOAT);
  22.169 +        this.isNaN = ScriptFunctionImpl.makeFunction("isNaN",   GlobalFunctions.IS_NAN,
  22.170 +                   new Specialization[] {
  22.171 +                        new Specialization(GlobalFunctions.IS_NAN_I),
  22.172 +                        new Specialization(GlobalFunctions.IS_NAN_J),
  22.173 +                        new Specialization(GlobalFunctions.IS_NAN_D) });
  22.174          this.parseFloat         = ScriptFunctionImpl.makeFunction("parseFloat", GlobalFunctions.PARSEFLOAT);
  22.175          this.isNaN              = ScriptFunctionImpl.makeFunction("isNaN",      GlobalFunctions.IS_NAN);
  22.176          this.isFinite           = ScriptFunctionImpl.makeFunction("isFinite",   GlobalFunctions.IS_FINITE);
  22.177 @@ -1720,15 +1762,15 @@
  22.178          this.quit               = ScriptFunctionImpl.makeFunction("quit",       EXIT);
  22.179  
  22.180          // built-in constructors
  22.181 -        this.builtinArray     = initConstructor("Array", ScriptFunction.class);
  22.182 -        this.builtinBoolean   = initConstructor("Boolean", ScriptFunction.class);
  22.183 -        this.builtinDate      = initConstructor("Date", ScriptFunction.class);
  22.184 -        this.builtinJSON      = initConstructor("JSON", ScriptObject.class);
  22.185 -        this.builtinJSAdapter = initConstructor("JSAdapter", ScriptFunction.class);
  22.186 -        this.builtinMath      = initConstructor("Math", ScriptObject.class);
  22.187 -        this.builtinNumber    = initConstructor("Number", ScriptFunction.class);
  22.188 -        this.builtinRegExp    = initConstructor("RegExp", ScriptFunction.class);
  22.189 -        this.builtinString    = initConstructor("String", ScriptFunction.class);
  22.190 +        this.builtinArray     = initConstructorAndSwitchPoint("Array", ScriptFunction.class);
  22.191 +        this.builtinBoolean   = initConstructorAndSwitchPoint("Boolean", ScriptFunction.class);
  22.192 +        this.builtinDate      = initConstructorAndSwitchPoint("Date", ScriptFunction.class);
  22.193 +        this.builtinJSON      = initConstructorAndSwitchPoint("JSON", ScriptObject.class);
  22.194 +        this.builtinJSAdapter = initConstructorAndSwitchPoint("JSAdapter", ScriptFunction.class);
  22.195 +        this.builtinMath      = initConstructorAndSwitchPoint("Math", ScriptObject.class);
  22.196 +        this.builtinNumber    = initConstructorAndSwitchPoint("Number", ScriptFunction.class);
  22.197 +        this.builtinRegExp    = initConstructorAndSwitchPoint("RegExp", ScriptFunction.class);
  22.198 +        this.builtinString    = initConstructorAndSwitchPoint("String", ScriptFunction.class);
  22.199  
  22.200          // initialize String.prototype.length to 0
  22.201          // add String.prototype.length
  22.202 @@ -1830,6 +1872,8 @@
  22.203          // Error.prototype.message = "";
  22.204          errorProto.set(NativeError.MESSAGE, "", 0);
  22.205  
  22.206 +        tagBuiltinProperties("Error", builtinError);
  22.207 +
  22.208          this.builtinEvalError = initErrorSubtype("EvalError", errorProto);
  22.209          this.builtinRangeError = initErrorSubtype("RangeError", errorProto);
  22.210          this.builtinReferenceError = initErrorSubtype("ReferenceError", errorProto);
  22.211 @@ -1844,6 +1888,7 @@
  22.212          prototype.set(NativeError.NAME, name, 0);
  22.213          prototype.set(NativeError.MESSAGE, "", 0);
  22.214          prototype.setInitialProto(errorProto);
  22.215 +        tagBuiltinProperties(name, cons);
  22.216          return cons;
  22.217      }
  22.218  
  22.219 @@ -1910,17 +1955,18 @@
  22.220      }
  22.221  
  22.222      private void initTypedArray() {
  22.223 -        this.builtinArrayBuffer       = initConstructor("ArrayBuffer", ScriptFunction.class);
  22.224 -        this.builtinDataView          = initConstructor("DataView", ScriptFunction.class);
  22.225 -        this.builtinInt8Array         = initConstructor("Int8Array", ScriptFunction.class);
  22.226 -        this.builtinUint8Array        = initConstructor("Uint8Array", ScriptFunction.class);
  22.227 -        this.builtinUint8ClampedArray = initConstructor("Uint8ClampedArray", ScriptFunction.class);
  22.228 -        this.builtinInt16Array        = initConstructor("Int16Array", ScriptFunction.class);
  22.229 -        this.builtinUint16Array       = initConstructor("Uint16Array", ScriptFunction.class);
  22.230 -        this.builtinInt32Array        = initConstructor("Int32Array", ScriptFunction.class);
  22.231 -        this.builtinUint32Array       = initConstructor("Uint32Array", ScriptFunction.class);
  22.232 -        this.builtinFloat32Array      = initConstructor("Float32Array", ScriptFunction.class);
  22.233 -        this.builtinFloat64Array      = initConstructor("Float64Array", ScriptFunction.class);
  22.234 +        this.builtinArrayBuffer       = initConstructorAndSwitchPoint("ArrayBuffer", ScriptFunction.class);
  22.235 +        this.builtinDataView          = initConstructorAndSwitchPoint("DataView", ScriptFunction.class);
  22.236 +        this.builtinInt8Array         = initConstructorAndSwitchPoint("Int8Array", ScriptFunction.class);
  22.237 +        this.builtinUint8Array        = initConstructorAndSwitchPoint("Uint8Array", ScriptFunction.class);
  22.238 +        this.builtinUint8ClampedArray = initConstructorAndSwitchPoint("Uint8ClampedArray", ScriptFunction.class);
  22.239 +        this.builtinInt16Array        = initConstructorAndSwitchPoint("Int16Array", ScriptFunction.class);
  22.240 +        this.builtinUint16Array       = initConstructorAndSwitchPoint("Uint16Array", ScriptFunction.class);
  22.241 +        this.builtinInt32Array        = initConstructorAndSwitchPoint("Int32Array", ScriptFunction.class);
  22.242 +        this.builtinUint32Array       = initConstructorAndSwitchPoint("Uint32Array", ScriptFunction.class);
  22.243 +        this.builtinFloat32Array      = initConstructorAndSwitchPoint("Float32Array", ScriptFunction.class);
  22.244 +        this.builtinFloat64Array      = initConstructorAndSwitchPoint("Float64Array", ScriptFunction.class);
  22.245 +
  22.246      }
  22.247  
  22.248      private void copyBuiltins() {
  22.249 @@ -1993,10 +2039,6 @@
  22.250          return UNDEFINED;
  22.251      }
  22.252  
  22.253 -    /**
  22.254 -     * These classes are generated by nasgen tool and so we have to use
  22.255 -     * reflection to load and create new instance of these classes.
  22.256 -     */
  22.257      private <T extends ScriptObject> T initConstructor(final String name, final Class<T> clazz) {
  22.258          try {
  22.259              // Assuming class name pattern for built-in JS constructors.
  22.260 @@ -2021,12 +2063,52 @@
  22.261              }
  22.262  
  22.263              res.setIsBuiltin();
  22.264 +
  22.265              return res;
  22.266          } catch (final ClassNotFoundException | InstantiationException | IllegalAccessException e) {
  22.267              throw new RuntimeException(e);
  22.268          }
  22.269      }
  22.270  
  22.271 +    private List<jdk.nashorn.internal.runtime.Property> extractBuiltinProperties(final String name, final ScriptObject func) {
  22.272 +        final List<jdk.nashorn.internal.runtime.Property> list = new ArrayList<>();
  22.273 +
  22.274 +        list.addAll(Arrays.asList(func.getMap().getProperties()));
  22.275 +
  22.276 +        if (func instanceof ScriptFunction) {
  22.277 +            final ScriptObject proto = ScriptFunction.getPrototype((ScriptFunction)func);
  22.278 +            if (proto != null) {
  22.279 +                list.addAll(Arrays.asList(proto.getMap().getProperties()));
  22.280 +            }
  22.281 +        }
  22.282 +
  22.283 +        final jdk.nashorn.internal.runtime.Property prop = getProperty(name);
  22.284 +        if (prop != null) {
  22.285 +            list.add(prop);
  22.286 +        }
  22.287 +
  22.288 +        return list;
  22.289 +    }
  22.290 +
  22.291 +    /**
  22.292 +     * Given a builtin object, traverse its properties recursively and associate them with a name that
  22.293 +     * will be a key to their invalidation switchpoint.
  22.294 +     * @param name name for key
  22.295 +     * @param func builtin script object
  22.296 +     */
  22.297 +    private void tagBuiltinProperties(final String name, final ScriptObject func) {
  22.298 +        SwitchPoint sp = context.getBuiltinSwitchPoint(name);
  22.299 +        if (sp == null) {
  22.300 +            sp = context.newBuiltinSwitchPoint(name);
  22.301 +        }
  22.302 +
  22.303 +        //get all builtin properties in this builtin object and register switchpoints keyed on the propery name,
  22.304 +        //one overwrite destroys all for now, e.g. Function.prototype.apply = 17; also destroys Function.prototype.call etc
  22.305 +        for (final jdk.nashorn.internal.runtime.Property prop : extractBuiltinProperties(name, func)) {
  22.306 +            prop.setBuiltinSwitchPoint(sp);
  22.307 +        }
  22.308 +    }
  22.309 +
  22.310      // Function and Object constructors are inter-dependent. Also,
  22.311      // Function.prototype
  22.312      // functions are not properly initialized. We fix the references here.
  22.313 @@ -2035,7 +2117,8 @@
  22.314      // to play with object references carefully!!
  22.315      private void initFunctionAndObject() {
  22.316          // First-n-foremost is Function
  22.317 -        this.builtinFunction      = initConstructor("Function", ScriptFunction.class);
  22.318 +
  22.319 +        this.builtinFunction = initConstructor("Function", ScriptFunction.class);
  22.320  
  22.321          // create global anonymous function
  22.322          final ScriptFunction anon = ScriptFunctionImpl.newAnonymousFunction();
  22.323 @@ -2101,13 +2184,6 @@
  22.324              }
  22.325          }
  22.326  
  22.327 -        //make sure apply and call have the same invalidation switchpoint
  22.328 -        final SwitchPoint sp = new SwitchPoint();
  22.329 -        optimisticFunctionMap.put("apply", sp);
  22.330 -        optimisticFunctionMap.put("call", sp);
  22.331 -        getFunctionPrototype().getProperty("apply").setChangeCallback(sp);
  22.332 -        getFunctionPrototype().getProperty("call").setChangeCallback(sp);
  22.333 -
  22.334          properties = getObjectPrototype().getMap().getProperties();
  22.335  
  22.336          for (final jdk.nashorn.internal.runtime.Property property : properties) {
  22.337 @@ -2125,10 +2201,10 @@
  22.338                  }
  22.339              }
  22.340          }
  22.341 -    }
  22.342  
  22.343 -    private static MethodHandle findOwnMH_V(final String name, final Class<?> rtype, final Class<?>... types) {
  22.344 -        return MH.findVirtual(MethodHandles.lookup(), Global.class, name, MH.type(rtype, types));
  22.345 +        tagBuiltinProperties("Object", builtinObject);
  22.346 +        tagBuiltinProperties("Function", builtinFunction);
  22.347 +        tagBuiltinProperties("Function", anon);
  22.348      }
  22.349  
  22.350      private static MethodHandle findOwnMH_S(final String name, final Class<?> rtype, final Class<?>... types) {
  22.351 @@ -2147,62 +2223,4 @@
  22.352      protected boolean isGlobal() {
  22.353          return true;
  22.354      }
  22.355 -
  22.356 -    /**
  22.357 -     * Check if there is a switchpoint for a reserved name. If there
  22.358 -     * is, it must be invalidated upon properties with this name
  22.359 -     * @param name property name
  22.360 -     * @return switchpoint for invalidating this property, or null if not registered
  22.361 -     */
  22.362 -    public SwitchPoint getChangeCallback(final String name) {
  22.363 -        return optimisticFunctionMap.get(name);
  22.364 -    }
  22.365 -
  22.366 -    /**
  22.367 -     * Is this a special name, that might be subject to invalidation
  22.368 -     * on write, such as "apply" or "call"
  22.369 -     * @param name name to check
  22.370 -     * @return true if special name
  22.371 -     */
  22.372 -    public boolean isSpecialName(final String name) {
  22.373 -        return getChangeCallback(name) != null;
  22.374 -    }
  22.375 -
  22.376 -    /**
  22.377 -     * Check if a reserved property name is invalidated
  22.378 -     * @param name property name
  22.379 -     * @return true if someone has written to it since Global was instantiated
  22.380 -     */
  22.381 -    public boolean isSpecialNameValid(final String name) {
  22.382 -        final SwitchPoint sp = getChangeCallback(name);
  22.383 -        return sp != null && !sp.hasBeenInvalidated();
  22.384 -    }
  22.385 -
  22.386 -    /**
  22.387 -     * Tag a reserved name as invalidated - used when someone writes
  22.388 -     * to a property with this name - overly conservative, but link time
  22.389 -     * is too late to apply e.g. apply-&gt;call specialization
  22.390 -     * @param name property name
  22.391 -     */
  22.392 -    public void invalidateReservedName(final String name) {
  22.393 -        final SwitchPoint sp = getChangeCallback(name);
  22.394 -        if (sp != null) {
  22.395 -            getContext().getLogger(ApplySpecialization.class).info("Overwrote special name '" + name +"' - invalidating switchpoint");
  22.396 -            SwitchPoint.invalidateAll(new SwitchPoint[] { sp });
  22.397 -        }
  22.398 -    }
  22.399 -
  22.400 -    /**
  22.401 -     * Bootstrapper for invalidating a builtin name
  22.402 -     * @param lookup lookup
  22.403 -     * @param name   name to invalidate
  22.404 -     * @param type   methodhandle type
  22.405 -     * @return callsite for invalidator
  22.406 -     */
  22.407 -    public static CallSite invalidateNameBootstrap(final MethodHandles.Lookup lookup, final String name, final MethodType type) {
  22.408 -        final MethodHandle target = MH.insertArguments(Global.instance().INVALIDATE_RESERVED_NAME, 0, name);
  22.409 -        return new ConstantCallSite(target);
  22.410 -    }
  22.411 -
  22.412 -
  22.413  }

    23.1 --- a/src/jdk/nashorn/internal/objects/NativeArray.java	Wed Oct 01 12:22:12 2014 +0200
    23.2 +++ b/src/jdk/nashorn/internal/objects/NativeArray.java	Thu Sep 25 15:53:47 2014 +0200
    23.3 @@ -1,5 +1,5 @@
    23.4  /*
    23.5 - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
    23.6 + * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
    23.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    23.8   *
    23.9   * This code is free software; you can redistribute it and/or modify it
   23.10 @@ -33,8 +33,8 @@
   23.11  import static jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator.arrayLikeIterator;
   23.12  import static jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator.reverseArrayLikeIterator;
   23.13  import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_STRICT;
   23.14 -
   23.15  import java.lang.invoke.MethodHandle;
   23.16 +import java.lang.invoke.SwitchPoint;
   23.17  import java.util.ArrayList;
   23.18  import java.util.Arrays;
   23.19  import java.util.Collections;
   23.20 @@ -52,12 +52,13 @@
   23.21  import jdk.nashorn.internal.objects.annotations.Getter;
   23.22  import jdk.nashorn.internal.objects.annotations.ScriptClass;
   23.23  import jdk.nashorn.internal.objects.annotations.Setter;
   23.24 -import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
   23.25  import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
   23.26 +import jdk.nashorn.internal.objects.annotations.SpecializedFunction.LinkLogic;
   23.27  import jdk.nashorn.internal.objects.annotations.Where;
   23.28  import jdk.nashorn.internal.runtime.Context;
   23.29  import jdk.nashorn.internal.runtime.Debug;
   23.30  import jdk.nashorn.internal.runtime.JSType;
   23.31 +import jdk.nashorn.internal.runtime.OptimisticBuiltins;
   23.32  import jdk.nashorn.internal.runtime.PropertyDescriptor;
   23.33  import jdk.nashorn.internal.runtime.PropertyMap;
   23.34  import jdk.nashorn.internal.runtime.ScriptFunction;
   23.35 @@ -67,17 +68,20 @@
   23.36  import jdk.nashorn.internal.runtime.arrays.ArrayData;
   23.37  import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
   23.38  import jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
   23.39 +import jdk.nashorn.internal.runtime.arrays.ContinuousArrayData;
   23.40 +import jdk.nashorn.internal.runtime.arrays.IntElements;
   23.41 +import jdk.nashorn.internal.runtime.arrays.IntOrLongElements;
   23.42  import jdk.nashorn.internal.runtime.arrays.IteratorAction;
   23.43 +import jdk.nashorn.internal.runtime.arrays.NumericElements;
   23.44  import jdk.nashorn.internal.runtime.linker.Bootstrap;
   23.45  import jdk.nashorn.internal.runtime.linker.InvokeByName;
   23.46 -import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
   23.47  
   23.48  /**
   23.49   * Runtime representation of a JavaScript array. NativeArray only holds numeric
   23.50   * keyed values. All other values are stored in spill.
   23.51   */
   23.52  @ScriptClass("Array")
   23.53 -public final class NativeArray extends ScriptObject {
   23.54 +public final class NativeArray extends ScriptObject implements OptimisticBuiltins {
   23.55      private static final Object JOIN                     = new Object();
   23.56      private static final Object EVERY_CALLBACK_INVOKER   = new Object();
   23.57      private static final Object SOME_CALLBACK_INVOKER    = new Object();
   23.58 @@ -88,6 +92,16 @@
   23.59      private static final Object CALL_CMP                 = new Object();
   23.60      private static final Object TO_LOCALE_STRING         = new Object();
   23.61  
   23.62 +    private SwitchPoint   lengthMadeNotWritableSwitchPoint;
   23.63 +    private PushLinkLogic pushLinkLogic;
   23.64 +    private PopLinkLogic  popLinkLogic;
   23.65 +
   23.66 +    /**
   23.67 +     * Index for the modification SwitchPoint that triggers when length
   23.68 +     * becomes not writable
   23.69 +     */
   23.70 +    private static final int LENGTH_NOT_WRITABLE_SWITCHPOINT = 0;
   23.71 +
   23.72      /*
   23.73       * Constructors.
   23.74       */
   23.75 @@ -420,6 +434,28 @@
   23.76          return getArray().asObjectArray();
   23.77      }
   23.78  
   23.79 +    @Override
   23.80 +    public void setIsLengthNotWritable() {
   23.81 +        super.setIsLengthNotWritable();
   23.82 +        /*
   23.83 +         * Switchpoints are created lazily. If we link any push or pop site,
   23.84 +         * we need to create the "length made not writable" switchpoint, if it
   23.85 +         * doesn't exist.
   23.86 +         *
   23.87 +         * If the switchpoint already exists, we will find it here, and invalidate
   23.88 +         * it, invalidating all previous callsites that use it.
   23.89 +         *
   23.90 +         * If the switchpoint doesn't exist, no push/pop has been linked so far,
   23.91 +         * because that would create it too. We invalidate it immediately and the
   23.92 +         * check link logic for all future callsites will fail immediately at link
   23.93 +         * time
   23.94 +         */
   23.95 +        if (lengthMadeNotWritableSwitchPoint == null) {
   23.96 +            lengthMadeNotWritableSwitchPoint = new SwitchPoint();
   23.97 +        }
   23.98 +        SwitchPoint.invalidateAll(new SwitchPoint[] { lengthMadeNotWritableSwitchPoint });
   23.99 +    }
  23.100 +
  23.101      /**
  23.102       * ECMA 15.4.3.2 Array.isArray ( arg )
  23.103       *
  23.104 @@ -638,7 +674,7 @@
  23.105       * @param self   self reference
  23.106       * @return the new NativeArray
  23.107       */
  23.108 -    @SpecializedConstructor
  23.109 +    @SpecializedFunction(isConstructor=true)
  23.110      public static NativeArray construct(final boolean newObj, final Object self) {
  23.111          return new NativeArray(0);
  23.112      }
  23.113 @@ -653,7 +689,7 @@
  23.114       * @param element first element
  23.115       * @return the new NativeArray
  23.116       */
  23.117 -    @SpecializedConstructor
  23.118 +    @SpecializedFunction(isConstructor=true)
  23.119      public static Object construct(final boolean newObj, final Object self, final boolean element) {
  23.120          return new NativeArray(new Object[] { element });
  23.121      }
  23.122 @@ -668,7 +704,7 @@
  23.123       * @param length array length
  23.124       * @return the new NativeArray
  23.125       */
  23.126 -    @SpecializedConstructor
  23.127 +    @SpecializedFunction(isConstructor=true)
  23.128      public static NativeArray construct(final boolean newObj, final Object self, final int length) {
  23.129          if (length >= 0) {
  23.130              return new NativeArray(length);
  23.131 @@ -687,7 +723,7 @@
  23.132       * @param length array length
  23.133       * @return the new NativeArray
  23.134       */
  23.135 -    @SpecializedConstructor
  23.136 +    @SpecializedFunction(isConstructor=true)
  23.137      public static NativeArray construct(final boolean newObj, final Object self, final long length) {
  23.138          if (length >= 0L && length <= JSType.MAX_UINT) {
  23.139              return new NativeArray(length);
  23.140 @@ -706,7 +742,7 @@
  23.141       * @param length array length
  23.142       * @return the new NativeArray
  23.143       */
  23.144 -    @SpecializedConstructor
  23.145 +    @SpecializedFunction(isConstructor=true)
  23.146      public static NativeArray construct(final boolean newObj, final Object self, final double length) {
  23.147          final long uint32length = JSType.toUint32(length);
  23.148  
  23.149 @@ -721,7 +757,7 @@
  23.150       * ECMA 15.4.4.4 Array.prototype.concat ( [ item1 [ , item2 [ , ... ] ] ] )
  23.151       *
  23.152       * @param self self reference
  23.153 -     * @param args arguments to concat
  23.154 +     * @param args arguments
  23.155       * @return resulting NativeArray
  23.156       */
  23.157      @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
  23.158 @@ -793,6 +829,68 @@
  23.159      }
  23.160  
  23.161      /**
  23.162 +     * Specialization of pop for ContinuousArrayData
  23.163 +     *   The link guard checks that the array is continuous AND not empty.
  23.164 +     *   The runtime guard checks that the guard is continuous (CCE otherwise)
  23.165 +     *
  23.166 +     * Primitive specialization, {@link LinkLogic}
  23.167 +     *
  23.168 +     * @param self self reference
  23.169 +     * @return element popped
  23.170 +     * @throws ClassCastException if array is empty, facilitating Undefined return value
  23.171 +     */
  23.172 +    @SpecializedFunction(name="pop", linkLogic=PopLinkLogic.class)
  23.173 +    public static int popInt(final Object self) {
  23.174 +        //must be non empty IntArrayData
  23.175 +        return getContinuousNonEmptyArrayDataCCE(self, IntElements.class).fastPopInt();
  23.176 +    }
  23.177 +
  23.178 +    /**
  23.179 +     * Specialization of pop for ContinuousArrayData
  23.180 +     *
  23.181 +     * Primitive specialization, {@link LinkLogic}
  23.182 +     *
  23.183 +     * @param self self reference
  23.184 +     * @return element popped
  23.185 +     * @throws ClassCastException if array is empty, facilitating Undefined return value
  23.186 +     */
  23.187 +    @SpecializedFunction(name="pop", linkLogic=PopLinkLogic.class)
  23.188 +    public static long popLong(final Object self) {
  23.189 +        //must be non empty Int or LongArrayData
  23.190 +        return getContinuousNonEmptyArrayDataCCE(self, IntOrLongElements.class).fastPopLong();
  23.191 +    }
  23.192 +
  23.193 +    /**
  23.194 +     * Specialization of pop for ContinuousArrayData
  23.195 +     *
  23.196 +     * Primitive specialization, {@link LinkLogic}
  23.197 +     *
  23.198 +     * @param self self reference
  23.199 +     * @return element popped
  23.200 +     * @throws ClassCastException if array is empty, facilitating Undefined return value
  23.201 +     */
  23.202 +    @SpecializedFunction(name="pop", linkLogic=PopLinkLogic.class)
  23.203 +    public static double popDouble(final Object self) {
  23.204 +        //must be non empty int long or double array data
  23.205 +        return getContinuousNonEmptyArrayDataCCE(self, NumericElements.class).fastPopDouble();
  23.206 +    }
  23.207 +
  23.208 +    /**
  23.209 +     * Specialization of pop for ContinuousArrayData
  23.210 +     *
  23.211 +     * Primitive specialization, {@link LinkLogic}
  23.212 +     *
  23.213 +     * @param self self reference
  23.214 +     * @return element popped
  23.215 +     * @throws ClassCastException if array is empty, facilitating Undefined return value
  23.216 +     */
  23.217 +    @SpecializedFunction(name="pop", linkLogic=PopLinkLogic.class)
  23.218 +    public static Object popObject(final Object self) {
  23.219 +        //can be any data, because the numeric ones will throw cce and force relink
  23.220 +        return getContinuousArrayDataCCE(self, null).fastPopObject();
  23.221 +    }
  23.222 +
  23.223 +    /**
  23.224       * ECMA 15.4.4.6 Array.prototype.pop ()
  23.225       *
  23.226       * @param self self reference
  23.227 @@ -829,6 +927,62 @@
  23.228      /**
  23.229       * ECMA 15.4.4.7 Array.prototype.push (args...)
  23.230       *
  23.231 +     * Primitive specialization, {@link LinkLogic}
  23.232 +     *
  23.233 +     * @param self self reference
  23.234 +     * @param arg a primitive to push
  23.235 +     * @return array length after push
  23.236 +     */
  23.237 +    @SpecializedFunction(linkLogic=PushLinkLogic.class)
  23.238 +    public static long push(final Object self, final int arg) {
  23.239 +        return getContinuousArrayDataCCE(self, Integer.class).fastPush(arg);
  23.240 +    }
  23.241 +
  23.242 +    /**
  23.243 +     * ECMA 15.4.4.7 Array.prototype.push (args...)
  23.244 +     *
  23.245 +     * Primitive specialization, {@link LinkLogic}
  23.246 +     *
  23.247 +     * @param self self reference
  23.248 +     * @param arg a primitive to push
  23.249 +     * @return array length after push
  23.250 +     */
  23.251 +    @SpecializedFunction(linkLogic=PushLinkLogic.class)
  23.252 +    public static long push(final Object self, final long arg) {
  23.253 +        return getContinuousArrayDataCCE(self, Long.class).fastPush(arg);
  23.254 +    }
  23.255 +
  23.256 +    /**
  23.257 +     * ECMA 15.4.4.7 Array.prototype.push (args...)
  23.258 +     *
  23.259 +     * Primitive specialization, {@link LinkLogic}
  23.260 +     *
  23.261 +     * @param self self reference
  23.262 +     * @param arg a primitive to push
  23.263 +     * @return array length after push
  23.264 +     */
  23.265 +    @SpecializedFunction(linkLogic=PushLinkLogic.class)
  23.266 +    public static long push(final Object self, final double arg) {
  23.267 +        return getContinuousArrayDataCCE(self, Double.class).fastPush(arg);
  23.268 +    }
  23.269 +
  23.270 +    /**
  23.271 +     * ECMA 15.4.4.7 Array.prototype.push (args...)
  23.272 +     *
  23.273 +     * Primitive specialization, {@link LinkLogic}
  23.274 +     *
  23.275 +     * @param self self reference
  23.276 +     * @param arg a primitive to push
  23.277 +     * @return array length after push
  23.278 +     */
  23.279 +    @SpecializedFunction(name="push", linkLogic=PushLinkLogic.class)
  23.280 +    public static long pushObject(final Object self, final Object arg) {
  23.281 +        return getContinuousArrayDataCCE(self, Object.class).fastPush(arg);
  23.282 +    }
  23.283 +
  23.284 +    /**
  23.285 +     * ECMA 15.4.4.7 Array.prototype.push (args...)
  23.286 +     *
  23.287       * @param self self reference
  23.288       * @param args arguments to push
  23.289       * @return array length after pushes
  23.290 @@ -857,61 +1011,6 @@
  23.291      }
  23.292  
  23.293      /**
  23.294 -     * ECMA 15.4.4.7 Array.prototype.push (args...) specialized for single int argument
  23.295 -     *
  23.296 -     * @param self self reference
  23.297 -     * @param arg argument to push
  23.298 -     * @return array after pushes
  23.299 -     */
  23.300 -/*    @SpecializedFunction
  23.301 -    public static long push(final Object self, final int arg) {
  23.302 -        try {
  23.303 -            final ScriptObject sobj = (ScriptObject)self;
  23.304 -            final ArrayData arrayData = sobj.getArray();
  23.305 -            final long length = arrayData.length();
  23.306 -
  23.307 -            if (bulkable(sobj) && length + 1 <= JSType.MAX_UINT) {
  23.308 -                sobj.setArray(arrayData.ensure(length).set(ArrayIndex.getArrayIndex(length), arg, true));
  23.309 -                return length + 1;
  23.310 -            }
  23.311 -
  23.312 -            long len = JSType.toUint32(sobj.getLength());
  23.313 -            sobj.set(len++, arg, true);
  23.314 -            sobj.set("length", len, true);
  23.315 -            return len;
  23.316 -        } catch (final ClassCastException | NullPointerException e) {
  23.317 -            throw typeError("not.an.object", ScriptRuntime.safeToString(self));
  23.318 -        }
  23.319 -    }
  23.320 -*/
  23.321 -    /**
  23.322 -     * ECMA 15.4.4.7 Array.prototype.push (args...) specialized for single number argument
  23.323 -     *
  23.324 -     * @param self self reference
  23.325 -     * @param arg argument to push
  23.326 -     * @return array after pushes
  23.327 -     */
  23.328 - /*   @SpecializedFunction
  23.329 -    public static long push(final Object self, final double arg) {
  23.330 -        try {
  23.331 -            final ScriptObject sobj = (ScriptObject)self;        final ArrayData arrayData = sobj.getArray();
  23.332 -            final long length = arrayData.length();
  23.333 -
  23.334 -            if (bulkable(sobj) && length + 1 <= JSType.MAX_UINT) {
  23.335 -                sobj.setArray(arrayData.ensure(length).set(ArrayIndex.getArrayIndex(length), arg, true));
  23.336 -                return length + 1;
  23.337 -            }
  23.338 -
  23.339 -            long len = JSType.toUint32(sobj.getLength());
  23.340 -            sobj.set(len++, arg, true);
  23.341 -            sobj.set("length", len, true);
  23.342 -            return len;
  23.343 -        } catch (final ClassCastException | NullPointerException e) {
  23.344 -            throw typeError("not.an.object", ScriptRuntime.safeToString(self));
  23.345 -        }
  23.346 -    }
  23.347 -*/
  23.348 -    /**
  23.349       * ECMA 15.4.4.7 Array.prototype.push (args...) specialized for single object argument
  23.350       *
  23.351       * @param self self reference
  23.352 @@ -925,7 +1024,7 @@
  23.353              final ArrayData arrayData = sobj.getArray();
  23.354              final long length = arrayData.length();
  23.355              if (bulkable(sobj) && length < JSType.MAX_UINT) {
  23.356 -                sobj.setArray(arrayData.push(true, arg)); //ensure(length).set(ArrayIndex.getArrayIndex(length), arg, true));
  23.357 +                sobj.setArray(arrayData.push(true, arg));
  23.358                  return length + 1;
  23.359              }
  23.360  
  23.361 @@ -1584,6 +1683,192 @@
  23.362  
  23.363      @Override
  23.364      public String toString() {
  23.365 -        return "NativeArray@" + Debug.id(this) + '@' + getArray().getClass().getSimpleName();
  23.366 +        return "NativeArray@" + Debug.id(this) + " [" + getArray().getClass().getSimpleName() + ']';
  23.367 +    }
  23.368 +
  23.369 +    @Override
  23.370 +    public SpecializedFunction.LinkLogic getLinkLogic(final Class<? extends LinkLogic> clazz) {
  23.371 +        if (clazz == PushLinkLogic.class) {
  23.372 +            return pushLinkLogic == null ? new PushLinkLogic(this) : pushLinkLogic;
  23.373 +        } else if (clazz == PopLinkLogic.class) {
  23.374 +            return popLinkLogic == null ? new PopLinkLogic(this) : pushLinkLogic;
  23.375 +        }
  23.376 +        return null;
  23.377 +    }
  23.378 +
  23.379 +    @Override
  23.380 +    public boolean hasPerInstanceAssumptions() {
  23.381 +        return true; //length switchpoint
  23.382 +    }
  23.383 +
  23.384 +    /**
  23.385 +     * This is an abstract super class that contains common functionality for all
  23.386 +     * specialized optimistic builtins in NativeArray. For example, it handles the
  23.387 +     * modification switchpoint which is touched when length is written.
  23.388 +     */
  23.389 +    private static abstract class ArrayLinkLogic extends SpecializedFunction.LinkLogic {
  23.390 +        private final NativeArray array;
  23.391 +
  23.392 +        protected ArrayLinkLogic(final NativeArray array) {
  23.393 +            this.array = array;
  23.394 +        }
  23.395 +
  23.396 +        private SwitchPoint getSwitchPoint() {
  23.397 +            return array.lengthMadeNotWritableSwitchPoint;
  23.398 +        }
  23.399 +
  23.400 +        private SwitchPoint newSwitchPoint() {
  23.401 +            assert array.lengthMadeNotWritableSwitchPoint == null;
  23.402 +            final SwitchPoint sp = new SwitchPoint();
  23.403 +            array.lengthMadeNotWritableSwitchPoint = sp;
  23.404 +            return sp;
  23.405 +        }
  23.406 +
  23.407 +        protected static ContinuousArrayData getContinuousArrayData(final Object self) {
  23.408 +            try {
  23.409 +                //cast to NativeArray, to avoid cases like x = {0:0, 1:1}, x.length = 2, where we can't use the array push/pop
  23.410 +                return (ContinuousArrayData)((NativeArray)self).getArray();
  23.411 +            } catch (final Exception e) {
  23.412 +                return null;
  23.413 +            }
  23.414 +        }
  23.415 +
  23.416 +        /**
  23.417 +         * Push and pop callsites can throw ClassCastException as a mechanism to have them
  23.418 +         * relinked - this enabled fast checks of the kind of ((IntArrayData)arrayData).push(x)
  23.419 +         * for an IntArrayData only push - if this fails, a CCE will be thrown and we will relink
  23.420 +         */
  23.421 +        @Override
  23.422 +        public Class<? extends Throwable> getRelinkException() {
  23.423 +            return ClassCastException.class;
  23.424 +        }
  23.425 +
  23.426 +        @Override
  23.427 +        public boolean hasModificationSwitchPoints() {
  23.428 +            return getSwitchPoint() != null;
  23.429 +        }
  23.430 +
  23.431 +        @Override
  23.432 +        public boolean hasModificationSwitchPoint(final int index) {
  23.433 +            assert index == LENGTH_NOT_WRITABLE_SWITCHPOINT;
  23.434 +            return hasModificationSwitchPoints();
  23.435 +        }
  23.436 +
  23.437 +        @Override
  23.438 +        public SwitchPoint getOrCreateModificationSwitchPoint(final int index) {
  23.439 +            assert index == LENGTH_NOT_WRITABLE_SWITCHPOINT;
  23.440 +            SwitchPoint sp = getSwitchPoint();
  23.441 +            if (sp == null) {
  23.442 +                sp = newSwitchPoint();
  23.443 +            }
  23.444 +            return sp;
  23.445 +        }
  23.446 +
  23.447 +        @Override
  23.448 +        public SwitchPoint[] getOrCreateModificationSwitchPoints() {
  23.449 +            return new SwitchPoint[] { getOrCreateModificationSwitchPoint(LENGTH_NOT_WRITABLE_SWITCHPOINT) };
  23.450 +        }
  23.451 +
  23.452 +        @Override
  23.453 +        public void invalidateModificationSwitchPoint(final int index) {
  23.454 +            assert index == LENGTH_NOT_WRITABLE_SWITCHPOINT;
  23.455 +            invalidateModificationSwitchPoints();
  23.456 +        }
  23.457 +
  23.458 +        @Override
  23.459 +        public void invalidateModificationSwitchPoints() {
  23.460 +            final SwitchPoint sp = getSwitchPoint();
  23.461 +            assert sp != null : "trying to invalidate non-existant modified SwitchPoint";
  23.462 +            if (!sp.hasBeenInvalidated()) {
  23.463 +                SwitchPoint.invalidateAll(new SwitchPoint[] { sp });
  23.464 +            }
  23.465 +        }
  23.466 +
  23.467 +        @Override
  23.468 +        public boolean hasInvalidatedModificationSwitchPoint(final int index) {
  23.469 +            assert index == LENGTH_NOT_WRITABLE_SWITCHPOINT;
  23.470 +            return hasInvalidatedModificationSwitchPoints();
  23.471 +        }
  23.472 +
  23.473 +        @Override
  23.474 +        public boolean hasInvalidatedModificationSwitchPoints() {
  23.475 +            final SwitchPoint sp = getSwitchPoint();
  23.476 +            return sp != null && !sp.hasBeenInvalidated();
  23.477 +        }
  23.478 +    }
  23.479 +
  23.480 +    /**
  23.481 +     * This is linker logic for optimistic pushes
  23.482 +     */
  23.483 +    private static final class PushLinkLogic extends ArrayLinkLogic {
  23.484 +        private PushLinkLogic(final NativeArray array) {
  23.485 +            super(array);
  23.486 +        }
  23.487 +
  23.488 +        @Override
  23.489 +        public boolean canLink(final Object self, final CallSiteDescriptor desc, final LinkRequest request) {
  23.490 +            return getContinuousArrayData(self) != null;
  23.491 +        }
  23.492 +    }
  23.493 +
  23.494 +    /**
  23.495 +     * This is linker logic for optimistic pops
  23.496 +     */
  23.497 +    private static final class PopLinkLogic extends ArrayLinkLogic {
  23.498 +        private PopLinkLogic(final NativeArray array) {
  23.499 +            super(array);
  23.500 +        }
  23.501 +
  23.502 +        /**
  23.503 +         * We need to check if we are dealing with a continuous non empty array data here,
  23.504 +         * as pop with a primitive return value returns undefined for arrays with length 0
  23.505 +         */
  23.506 +        @Override
  23.507 +        public boolean canLink(final Object self, final CallSiteDescriptor desc, final LinkRequest request) {
  23.508 +            final ContinuousArrayData data = getContinuousNonEmptyArrayData(self);
  23.509 +            if (data != null) {
  23.510 +                final Class<?> elementType = data.getElementType();
  23.511 +                final Class<?> returnType  = desc.getMethodType().returnType();
  23.512 +                final boolean  typeFits    = JSType.getAccessorTypeIndex(returnType) >= JSType.getAccessorTypeIndex(elementType);
  23.513 +                return typeFits;
  23.514 +            }
  23.515 +            return false;
  23.516 +        }
  23.517 +
  23.518 +        private static ContinuousArrayData getContinuousNonEmptyArrayData(final Object self) {
  23.519 +            final ContinuousArrayData data = getContinuousArrayData(self);
  23.520 +            if (data != null) {
  23.521 +                return data.length() == 0 ? null : data;
  23.522 +            }
  23.523 +            return null;
  23.524 +        }
  23.525 +    }
  23.526 +
  23.527 +    //runtime calls for push and pops. they could be used as guards, but they also perform the runtime logic,
  23.528 +    //so rather than synthesizing them into a guard method handle that would also perform the push on the
  23.529 +    //retrieved receiver, we use this as runtime logic
  23.530 +
  23.531 +    //TODO - fold these into the Link logics, but I'll do that as a later step, as I want to do a checkin
  23.532 +    //where everything works first
  23.533 +
  23.534 +    private static final <T> ContinuousArrayData getContinuousNonEmptyArrayDataCCE(final Object self, final Class<T> clazz) {
  23.535 +        try {
  23.536 +            @SuppressWarnings("unchecked")
  23.537 +            final ContinuousArrayData data = (ContinuousArrayData)(T)((NativeArray)self).getArray();
  23.538 +            if (data.length() != 0L) {
  23.539 +                return data; //if length is 0 we cannot pop and have to relink, because then we'd have to return an undefined, which is a wider type than e.g. int
  23.540 +           }
  23.541 +        } catch (final NullPointerException e) {
  23.542 +            //fallthru
  23.543 +        }
  23.544 +        throw new ClassCastException();
  23.545 +    }
  23.546 +
  23.547 +    private static final ContinuousArrayData getContinuousArrayDataCCE(final Object self, final Class<?> elementType) {
  23.548 +        try {
  23.549 +           return (ContinuousArrayData)((NativeArray)self).getArray(elementType); //ensure element type can fit "elementType"
  23.550 +        } catch (final NullPointerException e) {
  23.551 +            throw new ClassCastException();
  23.552 +        }
  23.553      }
  23.554  }

    24.1 --- a/src/jdk/nashorn/internal/objects/NativeDataView.java	Wed Oct 01 12:22:12 2014 +0200
    24.2 +++ b/src/jdk/nashorn/internal/objects/NativeDataView.java	Thu Sep 25 15:53:47 2014 +0200
    24.3 @@ -27,7 +27,6 @@
    24.4  import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
    24.5  import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
    24.6  import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
    24.7 -
    24.8  import java.nio.ByteBuffer;
    24.9  import java.nio.ByteOrder;
   24.10  import jdk.nashorn.internal.objects.annotations.Attribute;
   24.11 @@ -35,7 +34,6 @@
   24.12  import jdk.nashorn.internal.objects.annotations.Function;
   24.13  import jdk.nashorn.internal.objects.annotations.Property;
   24.14  import jdk.nashorn.internal.objects.annotations.ScriptClass;
   24.15 -import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
   24.16  import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
   24.17  import jdk.nashorn.internal.runtime.JSType;
   24.18  import jdk.nashorn.internal.runtime.PropertyMap;
   24.19 @@ -156,7 +154,7 @@
   24.20       * @param offset offset in bytes from the start of the ArrayBuffer
   24.21       * @return newly constructed DataView object
   24.22       */
   24.23 -    @SpecializedConstructor
   24.24 +    @SpecializedFunction(isConstructor=true)
   24.25      public static NativeDataView constructor(final boolean newObj, final Object self, final Object arrBuf, final int offset) {
   24.26          if (!(arrBuf instanceof NativeArrayBuffer)) {
   24.27              throw typeError("not.an.arraybuffer.in.dataview");
   24.28 @@ -174,7 +172,7 @@
   24.29       * @param length is the number of bytes from the offset that this DataView will reference
   24.30       * @return newly constructed DataView object
   24.31       */
   24.32 -    @SpecializedConstructor
   24.33 +    @SpecializedFunction(isConstructor=true)
   24.34      public static NativeDataView constructor(final boolean newObj, final Object self, final Object arrBuf, final int offset, final int length) {
   24.35          if (!(arrBuf instanceof NativeArrayBuffer)) {
   24.36              throw typeError("not.an.arraybuffer.in.dataview");

    25.1 --- a/src/jdk/nashorn/internal/objects/NativeDate.java	Wed Oct 01 12:22:12 2014 +0200
    25.2 +++ b/src/jdk/nashorn/internal/objects/NativeDate.java	Thu Sep 25 15:53:47 2014 +0200
    25.3 @@ -30,7 +30,6 @@
    25.4  import static java.lang.Double.isNaN;
    25.5  import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
    25.6  import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
    25.7 -
    25.8  import java.util.Locale;
    25.9  import java.util.TimeZone;
   25.10  import java.util.concurrent.Callable;
   25.11 @@ -38,7 +37,7 @@
   25.12  import jdk.nashorn.internal.objects.annotations.Constructor;
   25.13  import jdk.nashorn.internal.objects.annotations.Function;
   25.14  import jdk.nashorn.internal.objects.annotations.ScriptClass;
   25.15 -import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
   25.16 +import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
   25.17  import jdk.nashorn.internal.objects.annotations.Where;
   25.18  import jdk.nashorn.internal.parser.DateParser;
   25.19  import jdk.nashorn.internal.runtime.ConsString;
   25.20 @@ -155,7 +154,7 @@
   25.21       * @param self  self references
   25.22       * @return Date representing now
   25.23       */
   25.24 -    @SpecializedConstructor
   25.25 +    @SpecializedFunction(isConstructor=true)
   25.26      public static Object construct(final boolean isNew, final Object self) {
   25.27          final NativeDate result = new NativeDate();
   25.28          return isNew ? result : toStringImpl(result, FORMAT_DATE_TIME);

    26.1 --- a/src/jdk/nashorn/internal/objects/NativeDebug.java	Wed Oct 01 12:22:12 2014 +0200
    26.2 +++ b/src/jdk/nashorn/internal/objects/NativeDebug.java	Thu Sep 25 15:53:47 2014 +0200
    26.3 @@ -26,7 +26,6 @@
    26.4  package jdk.nashorn.internal.objects;
    26.5  
    26.6  import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
    26.7 -
    26.8  import java.io.PrintWriter;
    26.9  import java.util.LinkedList;
   26.10  import java.util.Objects;
   26.11 @@ -262,8 +261,8 @@
   26.12  
   26.13      /**
   26.14       * Set the event queue capacity
   26.15 -     * @param self
   26.16 -     * @param newCapacity
   26.17 +     * @param self an event queue
   26.18 +     * @param newCapacity new capacity
   26.19       */
   26.20      @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
   26.21      public static void setEventQueueCapacity(final Object self, final Object newCapacity) {

    27.1 --- a/src/jdk/nashorn/internal/objects/NativeFloat32Array.java	Wed Oct 01 12:22:12 2014 +0200
    27.2 +++ b/src/jdk/nashorn/internal/objects/NativeFloat32Array.java	Thu Sep 25 15:53:47 2014 +0200
    27.3 @@ -26,7 +26,6 @@
    27.4  package jdk.nashorn.internal.objects;
    27.5  
    27.6  import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
    27.7 -
    27.8  import java.lang.invoke.MethodHandle;
    27.9  import java.lang.invoke.MethodHandles;
   27.10  import java.nio.ByteBuffer;
   27.11 @@ -85,6 +84,11 @@
   27.12          }
   27.13  
   27.14          @Override
   27.15 +        public Class<?> getElementType() {
   27.16 +            return double.class;
   27.17 +        }
   27.18 +
   27.19 +        @Override
   27.20          protected MethodHandle getGetElem() {
   27.21              return GET_ELEM;
   27.22          }

    28.1 --- a/src/jdk/nashorn/internal/objects/NativeFloat64Array.java	Wed Oct 01 12:22:12 2014 +0200
    28.2 +++ b/src/jdk/nashorn/internal/objects/NativeFloat64Array.java	Thu Sep 25 15:53:47 2014 +0200
    28.3 @@ -26,7 +26,6 @@
    28.4  package jdk.nashorn.internal.objects;
    28.5  
    28.6  import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
    28.7 -
    28.8  import java.lang.invoke.MethodHandle;
    28.9  import java.lang.invoke.MethodHandles;
   28.10  import java.nio.ByteBuffer;
   28.11 @@ -94,6 +93,11 @@
   28.12              return SET_ELEM;
   28.13          }
   28.14  
   28.15 +        @Override
   28.16 +        public Class<?> getElementType() {
   28.17 +            return double.class;
   28.18 +        }
   28.19 +
   28.20          private double getElem(final int index) {
   28.21              try {
   28.22                  return nb.get(index);

    29.1 --- a/src/jdk/nashorn/internal/objects/NativeInt16Array.java	Wed Oct 01 12:22:12 2014 +0200
    29.2 +++ b/src/jdk/nashorn/internal/objects/NativeInt16Array.java	Thu Sep 25 15:53:47 2014 +0200
    29.3 @@ -26,7 +26,6 @@
    29.4  package jdk.nashorn.internal.objects;
    29.5  
    29.6  import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
    29.7 -
    29.8  import java.lang.invoke.MethodHandle;
    29.9  import java.lang.invoke.MethodHandles;
   29.10  import java.nio.ByteBuffer;
   29.11 @@ -95,6 +94,11 @@
   29.12              return SET_ELEM;
   29.13          }
   29.14  
   29.15 +        @Override
   29.16 +        public Class<?> getElementType() {
   29.17 +            return int.class;
   29.18 +        }
   29.19 +
   29.20          private int getElem(final int index) {
   29.21              try {
   29.22                  return nb.get(index);

    30.1 --- a/src/jdk/nashorn/internal/objects/NativeInt32Array.java	Wed Oct 01 12:22:12 2014 +0200
    30.2 +++ b/src/jdk/nashorn/internal/objects/NativeInt32Array.java	Thu Sep 25 15:53:47 2014 +0200
    30.3 @@ -26,7 +26,6 @@
    30.4  package jdk.nashorn.internal.objects;
    30.5  
    30.6  import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
    30.7 -
    30.8  import java.lang.invoke.MethodHandle;
    30.9  import java.lang.invoke.MethodHandles;
   30.10  import java.nio.ByteBuffer;
   30.11 @@ -113,6 +112,11 @@
   30.12          }
   30.13  
   30.14          @Override
   30.15 +        public Class<?> getElementType() {
   30.16 +            return int.class;
   30.17 +        }
   30.18 +
   30.19 +        @Override
   30.20          public int getInt(final int index) {
   30.21              return getElem(index);
   30.22          }

    31.1 --- a/src/jdk/nashorn/internal/objects/NativeInt8Array.java	Wed Oct 01 12:22:12 2014 +0200
    31.2 +++ b/src/jdk/nashorn/internal/objects/NativeInt8Array.java	Thu Sep 25 15:53:47 2014 +0200
    31.3 @@ -26,7 +26,6 @@
    31.4  package jdk.nashorn.internal.objects;
    31.5  
    31.6  import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
    31.7 -
    31.8  import java.lang.invoke.MethodHandle;
    31.9  import java.lang.invoke.MethodHandles;
   31.10  import java.nio.ByteBuffer;
   31.11 @@ -93,6 +92,11 @@
   31.12              return SET_ELEM;
   31.13          }
   31.14  
   31.15 +        @Override
   31.16 +        public Class<?> getElementType() {
   31.17 +            return int.class;
   31.18 +        }
   31.19 +
   31.20          private int getElem(final int index) {
   31.21              try {
   31.22                  return nb.get(index);

    32.1 --- a/src/jdk/nashorn/internal/objects/NativeJSAdapter.java	Wed Oct 01 12:22:12 2014 +0200
    32.2 +++ b/src/jdk/nashorn/internal/objects/NativeJSAdapter.java	Thu Sep 25 15:53:47 2014 +0200
    32.3 @@ -48,7 +48,6 @@
    32.4  import jdk.nashorn.internal.runtime.ScriptFunction;
    32.5  import jdk.nashorn.internal.runtime.ScriptObject;
    32.6  import jdk.nashorn.internal.runtime.ScriptRuntime;
    32.7 -import jdk.nashorn.internal.runtime.UnwarrantedOptimismException;
    32.8  import jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
    32.9  import jdk.nashorn.internal.scripts.JO;
   32.10  

    33.1 --- a/src/jdk/nashorn/internal/objects/NativeRegExp.java	Wed Oct 01 12:22:12 2014 +0200
    33.2 +++ b/src/jdk/nashorn/internal/objects/NativeRegExp.java	Thu Sep 25 15:53:47 2014 +0200
    33.3 @@ -33,13 +33,14 @@
    33.4  import java.util.Arrays;
    33.5  import java.util.List;
    33.6  import java.util.concurrent.Callable;
    33.7 +
    33.8  import jdk.nashorn.internal.objects.annotations.Attribute;
    33.9  import jdk.nashorn.internal.objects.annotations.Constructor;
   33.10  import jdk.nashorn.internal.objects.annotations.Function;
   33.11  import jdk.nashorn.internal.objects.annotations.Getter;
   33.12  import jdk.nashorn.internal.objects.annotations.Property;
   33.13  import jdk.nashorn.internal.objects.annotations.ScriptClass;
   33.14 -import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
   33.15 +import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
   33.16  import jdk.nashorn.internal.objects.annotations.Where;
   33.17  import jdk.nashorn.internal.runtime.BitVector;
   33.18  import jdk.nashorn.internal.runtime.JSType;
   33.19 @@ -143,7 +144,7 @@
   33.20       * @param self  self reference
   33.21       * @return new NativeRegExp
   33.22       */
   33.23 -    @SpecializedConstructor
   33.24 +    @SpecializedFunction(isConstructor=true)
   33.25      public static NativeRegExp constructor(final boolean isNew, final Object self) {
   33.26          return new NativeRegExp("", "");
   33.27      }
   33.28 @@ -158,7 +159,7 @@
   33.29       * @param pattern pattern
   33.30       * @return new NativeRegExp
   33.31       */
   33.32 -    @SpecializedConstructor
   33.33 +    @SpecializedFunction(isConstructor=true)
   33.34      public static NativeRegExp constructor(final boolean isNew, final Object self, final Object pattern) {
   33.35          return newRegExp(pattern, UNDEFINED);
   33.36      }
   33.37 @@ -174,7 +175,7 @@
   33.38       * @param flags  flags
   33.39       * @return new NativeRegExp
   33.40       */
   33.41 -    @SpecializedConstructor
   33.42 +    @SpecializedFunction(isConstructor=true)
   33.43      public static NativeRegExp constructor(final boolean isNew, final Object self, final Object pattern, final Object flags) {
   33.44          return newRegExp(pattern, flags);
   33.45      }

    34.1 --- a/src/jdk/nashorn/internal/objects/NativeString.java	Wed Oct 01 12:22:12 2014 +0200
    34.2 +++ b/src/jdk/nashorn/internal/objects/NativeString.java	Thu Sep 25 15:53:47 2014 +0200
    34.3 @@ -29,7 +29,6 @@
    34.4  import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
    34.5  import static jdk.nashorn.internal.runtime.JSType.isRepresentableAsInt;
    34.6  import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
    34.7 -
    34.8  import java.lang.invoke.MethodHandle;
    34.9  import java.lang.invoke.MethodHandles;
   34.10  import java.lang.invoke.MethodType;
   34.11 @@ -49,11 +48,12 @@
   34.12  import jdk.nashorn.internal.objects.annotations.Function;
   34.13  import jdk.nashorn.internal.objects.annotations.Getter;
   34.14  import jdk.nashorn.internal.objects.annotations.ScriptClass;
   34.15 -import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
   34.16  import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
   34.17 +import jdk.nashorn.internal.objects.annotations.SpecializedFunction.LinkLogic;
   34.18  import jdk.nashorn.internal.objects.annotations.Where;
   34.19  import jdk.nashorn.internal.runtime.ConsString;
   34.20  import jdk.nashorn.internal.runtime.JSType;
   34.21 +import jdk.nashorn.internal.runtime.OptimisticBuiltins;
   34.22  import jdk.nashorn.internal.runtime.PropertyMap;
   34.23  import jdk.nashorn.internal.runtime.ScriptFunction;
   34.24  import jdk.nashorn.internal.runtime.ScriptObject;
   34.25 @@ -67,7 +67,7 @@
   34.26   * ECMA 15.5 String Objects.
   34.27   */
   34.28  @ScriptClass("String")
   34.29 -public final class NativeString extends ScriptObject {
   34.30 +public final class NativeString extends ScriptObject implements OptimisticBuiltins {
   34.31  
   34.32      private final CharSequence value;
   34.33  
   34.34 @@ -568,6 +568,14 @@
   34.35          return pos < 0 || pos >= str.length() ? "" : String.valueOf(str.charAt(pos));
   34.36      }
   34.37  
   34.38 +    private static int getValidChar(final Object self, final int pos) {
   34.39 +        try {
   34.40 +            return ((CharSequence)self).charAt(pos);
   34.41 +        } catch (final IndexOutOfBoundsException e) {
   34.42 +            throw new ClassCastException();
   34.43 +        }
   34.44 +    }
   34.45 +
   34.46      /**
   34.47       * ECMA 15.5.4.5 String.prototype.charCodeAt (pos)
   34.48       * @param self self reference
   34.49 @@ -576,7 +584,9 @@
   34.50       */
   34.51      @Function(attributes = Attribute.NOT_ENUMERABLE)
   34.52      public static double charCodeAt(final Object self, final Object pos) {
   34.53 -        return charCodeAtImpl(checkObjectToString(self), JSType.toInteger(pos));
   34.54 +        final String str = checkObjectToString(self);
   34.55 +        final int    idx = JSType.toInteger(pos);
   34.56 +        return idx < 0 || idx >= str.length() ? Double.NaN : str.charAt(idx);
   34.57      }
   34.58  
   34.59      /**
   34.60 @@ -585,9 +595,20 @@
   34.61       * @param pos  position in string
   34.62       * @return number representing charcode at position
   34.63       */
   34.64 -    @SpecializedFunction
   34.65 -    public static double charCodeAt(final Object self, final double pos) {
   34.66 -        return charCodeAt(self, (int) pos);
   34.67 +    @SpecializedFunction(linkLogic=CharCodeAtLinkLogic.class)
   34.68 +    public static int charCodeAt(final Object self, final double pos) {
   34.69 +        return charCodeAt(self, (int)pos); //toInt pos is ok
   34.70 +    }
   34.71 +
   34.72 +    /**
   34.73 +     * ECMA 15.5.4.5 String.prototype.charCodeAt (pos) - specialized version for long position
   34.74 +     * @param self self reference
   34.75 +     * @param pos  position in string
   34.76 +     * @return number representing charcode at position
   34.77 +     */
   34.78 +    @SpecializedFunction(linkLogic=CharCodeAtLinkLogic.class)
   34.79 +    public static int charCodeAt(final Object self, final long pos) {
   34.80 +        return charCodeAt(self, (int)pos);
   34.81      }
   34.82  
   34.83      /**
   34.84 @@ -596,13 +617,10 @@
   34.85       * @param pos  position in string
   34.86       * @return number representing charcode at position
   34.87       */
   34.88 -    @SpecializedFunction
   34.89 -    public static double charCodeAt(final Object self, final int pos) {
   34.90 -        return charCodeAtImpl(checkObjectToString(self), pos);
   34.91 -    }
   34.92  
   34.93 -    private static double charCodeAtImpl(final String str, final int pos) {
   34.94 -        return pos < 0 || pos >= str.length() ? Double.NaN : str.charAt(pos);
   34.95 +    @SpecializedFunction(linkLogic=CharCodeAtLinkLogic.class)
   34.96 +    public static int charCodeAt(final Object self, final int pos) {
   34.97 +        return getValidChar(self, pos);
   34.98      }
   34.99  
  34.100      /**
  34.101 @@ -1097,7 +1115,6 @@
  34.102       */
  34.103      @Function(attributes = Attribute.NOT_ENUMERABLE)
  34.104      public static String trim(final Object self) {
  34.105 -
  34.106          final String str = checkObjectToString(self);
  34.107          int start = 0;
  34.108          int end   = str.length() - 1;
  34.109 @@ -1181,7 +1198,7 @@
  34.110       *
  34.111       * @return new NativeString ("")
  34.112       */
  34.113 -    @SpecializedConstructor
  34.114 +    @SpecializedFunction(isConstructor=true)
  34.115      public static Object constructor(final boolean newObj, final Object self) {
  34.116          return newObj ? newObj("") : "";
  34.117      }
  34.118 @@ -1197,7 +1214,7 @@
  34.119       *
  34.120       * @return new NativeString (arg)
  34.121       */
  34.122 -    @SpecializedConstructor
  34.123 +    @SpecializedFunction(isConstructor=true)
  34.124      public static Object constructor(final boolean newObj, final Object self, final Object arg) {
  34.125          final CharSequence str = JSType.toCharSequence(arg);
  34.126          return newObj ? newObj(str) : str.toString();
  34.127 @@ -1214,8 +1231,42 @@
  34.128       *
  34.129       * @return new NativeString containing the string representation of the arg
  34.130       */
  34.131 -    @SpecializedConstructor
  34.132 +    @SpecializedFunction(isConstructor=true)
  34.133      public static Object constructor(final boolean newObj, final Object self, final int arg) {
  34.134 +        final String str = Integer.toString(arg);
  34.135 +        return newObj ? newObj(str) : str;
  34.136 +    }
  34.137 +
  34.138 +    /**
  34.139 +     * ECMA 15.5.2.1 new String ( [ value ] ) - special version with exactly one {@code int} arg
  34.140 +     *
  34.141 +     * Constructor
  34.142 +     *
  34.143 +     * @param newObj is this constructor invoked with the new operator
  34.144 +     * @param self   self reference
  34.145 +     * @param arg    the arg
  34.146 +     *
  34.147 +     * @return new NativeString containing the string representation of the arg
  34.148 +     */
  34.149 +    @SpecializedFunction(isConstructor=true)
  34.150 +    public static Object constructor(final boolean newObj, final Object self, final long arg) {
  34.151 +        final String str = Long.toString(arg);
  34.152 +        return newObj ? newObj(str) : str;
  34.153 +    }
  34.154 +
  34.155 +    /**
  34.156 +     * ECMA 15.5.2.1 new String ( [ value ] ) - special version with exactly one {@code int} arg
  34.157 +     *
  34.158 +     * Constructor
  34.159 +     *
  34.160 +     * @param newObj is this constructor invoked with the new operator
  34.161 +     * @param self   self reference
  34.162 +     * @param arg    the arg
  34.163 +     *
  34.164 +     * @return new NativeString containing the string representation of the arg
  34.165 +     */
  34.166 +    @SpecializedFunction(isConstructor=true)
  34.167 +    public static Object constructor(final boolean newObj, final Object self, final double arg) {
  34.168          final String str = JSType.toString(arg);
  34.169          return newObj ? newObj(str) : str;
  34.170      }
  34.171 @@ -1231,9 +1282,9 @@
  34.172       *
  34.173       * @return new NativeString containing the string representation of the arg
  34.174       */
  34.175 -    @SpecializedConstructor
  34.176 +    @SpecializedFunction(isConstructor=true)
  34.177      public static Object constructor(final boolean newObj, final Object self, final boolean arg) {
  34.178 -        final String str = JSType.toString(arg);
  34.179 +        final String str = Boolean.toString(arg);
  34.180          return newObj ? newObj(str) : str;
  34.181      }
  34.182  
  34.183 @@ -1281,7 +1332,7 @@
  34.184          } else if (self != null && self == Global.instance().getStringPrototype()) {
  34.185              return "";
  34.186          } else {
  34.187 -            throw typeError( "not.a.string", ScriptRuntime.safeToString(self));
  34.188 +            throw typeError("not.a.string", ScriptRuntime.safeToString(self));
  34.189          }
  34.190      }
  34.191  
  34.192 @@ -1310,4 +1361,50 @@
  34.193          return MH.findStatic(MethodHandles.lookup(), NativeString.class, name, type);
  34.194      }
  34.195  
  34.196 +    @Override
  34.197 +    public LinkLogic getLinkLogic(final Class<? extends LinkLogic> clazz) {
  34.198 +        if (clazz == CharCodeAtLinkLogic.class) {
  34.199 +            return CharCodeAtLinkLogic.INSTANCE;
  34.200 +        }
  34.201 +        return null;
  34.202 +    }
  34.203 +
  34.204 +    @Override
  34.205 +    public boolean hasPerInstanceAssumptions() {
  34.206 +        return false;
  34.207 +    }
  34.208 +
  34.209 +    /**
  34.210 +     * This is linker logic charCodeAt - when we specialize further methods in NativeString
  34.211 +     * It may be expanded. It's link check makes sure that we are dealing with a char
  34.212 +     * sequence and that we are in range
  34.213 +     */
  34.214 +    private static final class CharCodeAtLinkLogic extends SpecializedFunction.LinkLogic {
  34.215 +
  34.216 +        private static final CharCodeAtLinkLogic INSTANCE = new CharCodeAtLinkLogic();
  34.217 +
  34.218 +        @Override
  34.219 +        public boolean canLink(final Object self, final CallSiteDescriptor desc, final LinkRequest request) {
  34.220 +            try {
  34.221 +                //check that it's a char sequence or throw cce
  34.222 +                final CharSequence cs = (CharSequence)self;
  34.223 +                //check that the index, representable as an int, is inside the array
  34.224 +                final int intIndex = JSType.toInteger(request.getArguments()[1]);
  34.225 +                return intIndex >= 0 && intIndex < cs.length(); //can link
  34.226 +            } catch (final ClassCastException | IndexOutOfBoundsException e) {
  34.227 +                //fallthru
  34.228 +            }
  34.229 +            return false;
  34.230 +        }
  34.231 +
  34.232 +        /**
  34.233 +         * charCodeAt callsites can throw ClassCastException as a mechanism to have them
  34.234 +         * relinked - this enabled fast checks of the kind of ((IntArrayData)arrayData).push(x)
  34.235 +         * for an IntArrayData only push - if this fails, a CCE will be thrown and we will relink
  34.236 +         */
  34.237 +        @Override
  34.238 +        public Class<? extends Throwable> getRelinkException() {
  34.239 +            return ClassCastException.class;
  34.240 +        }
  34.241 +    }
  34.242  }

    35.1 --- a/src/jdk/nashorn/internal/objects/NativeUint16Array.java	Wed Oct 01 12:22:12 2014 +0200
    35.2 +++ b/src/jdk/nashorn/internal/objects/NativeUint16Array.java	Thu Sep 25 15:53:47 2014 +0200
    35.3 @@ -26,7 +26,6 @@
    35.4  package jdk.nashorn.internal.objects;
    35.5  
    35.6  import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
    35.7 -
    35.8  import java.lang.invoke.MethodHandle;
    35.9  import java.lang.invoke.MethodHandles;
   35.10  import java.nio.ByteBuffer;
   35.11 @@ -119,6 +118,11 @@
   35.12          }
   35.13  
   35.14          @Override
   35.15 +        public Class<?> getElementType() {
   35.16 +            return int.class;
   35.17 +        }
   35.18 +
   35.19 +        @Override
   35.20          public int getInt(final int index) {
   35.21              return getElem(index);
   35.22          }

    36.1 --- a/src/jdk/nashorn/internal/objects/NativeUint32Array.java	Wed Oct 01 12:22:12 2014 +0200
    36.2 +++ b/src/jdk/nashorn/internal/objects/NativeUint32Array.java	Thu Sep 25 15:53:47 2014 +0200
    36.3 @@ -26,7 +26,6 @@
    36.4  package jdk.nashorn.internal.objects;
    36.5  
    36.6  import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
    36.7 -
    36.8  import java.lang.invoke.MethodHandle;
    36.9  import java.lang.invoke.MethodHandles;
   36.10  import java.nio.ByteBuffer;
   36.11 @@ -128,6 +127,11 @@
   36.12          }
   36.13  
   36.14          @Override
   36.15 +        public Class<?> getElementType() {
   36.16 +            return int.class;
   36.17 +        }
   36.18 +
   36.19 +        @Override
   36.20          public int getInt(final int index) {
   36.21              return (int)getLong(index);
   36.22          }

    37.1 --- a/src/jdk/nashorn/internal/objects/NativeUint8Array.java	Wed Oct 01 12:22:12 2014 +0200
    37.2 +++ b/src/jdk/nashorn/internal/objects/NativeUint8Array.java	Thu Sep 25 15:53:47 2014 +0200
    37.3 @@ -26,7 +26,6 @@
    37.4  package jdk.nashorn.internal.objects;
    37.5  
    37.6  import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
    37.7 -
    37.8  import java.lang.invoke.MethodHandle;
    37.9  import java.lang.invoke.MethodHandles;
   37.10  import java.nio.ByteBuffer;
   37.11 @@ -119,6 +118,11 @@
   37.12          }
   37.13  
   37.14          @Override
   37.15 +        public Class<?> getElementType() {
   37.16 +            return int.class;
   37.17 +        }
   37.18 +
   37.19 +        @Override
   37.20          public int getInt(final int index) {
   37.21              return getElem(index);
   37.22          }

    38.1 --- a/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java	Wed Oct 01 12:22:12 2014 +0200
    38.2 +++ b/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java	Thu Sep 25 15:53:47 2014 +0200
    38.3 @@ -28,7 +28,6 @@
    38.4  import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
    38.5  import static jdk.nashorn.internal.codegen.CompilerConstants.staticCall;
    38.6  import static jdk.nashorn.internal.lookup.Lookup.MH;
    38.7 -
    38.8  import java.lang.invoke.MethodHandle;
    38.9  import java.lang.invoke.MethodHandles;
   38.10  import java.nio.ByteBuffer;
   38.11 @@ -98,6 +97,11 @@
   38.12              return SET_ELEM;
   38.13          }
   38.14  
   38.15 +        @Override
   38.16 +        public Class<?> getElementType() {
   38.17 +            return int.class;
   38.18 +        }
   38.19 +
   38.20          private int getElem(final int index) {
   38.21              try {
   38.22                  return nb.get(index) & 0xff;

    39.1 --- a/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java	Wed Oct 01 12:22:12 2014 +0200
    39.2 +++ b/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java	Thu Sep 25 15:53:47 2014 +0200
    39.3 @@ -30,6 +30,7 @@
    39.4  
    39.5  import java.lang.invoke.MethodHandle;
    39.6  import java.util.ArrayList;
    39.7 +
    39.8  import jdk.nashorn.internal.runtime.AccessorProperty;
    39.9  import jdk.nashorn.internal.runtime.GlobalFunctions;
   39.10  import jdk.nashorn.internal.runtime.Property;
   39.11 @@ -38,6 +39,7 @@
   39.12  import jdk.nashorn.internal.runtime.ScriptFunction;
   39.13  import jdk.nashorn.internal.runtime.ScriptFunctionData;
   39.14  import jdk.nashorn.internal.runtime.ScriptObject;
   39.15 +import jdk.nashorn.internal.runtime.Specialization;
   39.16  
   39.17  /**
   39.18   * Concrete implementation of ScriptFunction. This sets correct map for the
   39.19 @@ -58,7 +60,7 @@
   39.20      // Marker object for lazily initialized prototype object
   39.21      private static final Object LAZY_PROTOTYPE = new Object();
   39.22  
   39.23 -    private ScriptFunctionImpl(final String name, final MethodHandle invokeHandle, final MethodHandle[] specs, final Global global) {
   39.24 +    private ScriptFunctionImpl(final String name, final MethodHandle invokeHandle, final Specialization[] specs, final Global global) {
   39.25          super(name, invokeHandle, map$, null, specs, ScriptFunctionData.IS_BUILTIN_CONSTRUCTOR);
   39.26          init(global);
   39.27      }
   39.28 @@ -71,11 +73,11 @@
   39.29       * @param invokeHandle handle for invocation
   39.30       * @param specs specialized versions of this method, if available, null otherwise
   39.31       */
   39.32 -    ScriptFunctionImpl(final String name, final MethodHandle invokeHandle, final MethodHandle[] specs) {
   39.33 +    ScriptFunctionImpl(final String name, final MethodHandle invokeHandle, final Specialization[] specs) {
   39.34          this(name, invokeHandle, specs, Global.instance());
   39.35      }
   39.36  
   39.37 -    private ScriptFunctionImpl(final String name, final MethodHandle invokeHandle, final PropertyMap map, final MethodHandle[] specs, final Global global) {
   39.38 +    private ScriptFunctionImpl(final String name, final MethodHandle invokeHandle, final PropertyMap map, final Specialization[] specs, final Global global) {
   39.39          super(name, invokeHandle, map.addAll(map$), null, specs, ScriptFunctionData.IS_BUILTIN_CONSTRUCTOR);
   39.40          init(global);
   39.41      }
   39.42 @@ -89,11 +91,11 @@
   39.43       * @param map initial property map
   39.44       * @param specs specialized versions of this method, if available, null otherwise
   39.45       */
   39.46 -    ScriptFunctionImpl(final String name, final MethodHandle invokeHandle, final PropertyMap map, final MethodHandle[] specs) {
   39.47 +    ScriptFunctionImpl(final String name, final MethodHandle invokeHandle, final PropertyMap map, final Specialization[] specs) {
   39.48          this(name, invokeHandle, map, specs, Global.instance());
   39.49      }
   39.50  
   39.51 -    private ScriptFunctionImpl(final String name, final MethodHandle methodHandle, final ScriptObject scope, final MethodHandle[] specs, final int flags, final Global global) {
   39.52 +    private ScriptFunctionImpl(final String name, final MethodHandle methodHandle, final ScriptObject scope, final Specialization[] specs, final int flags, final Global global) {
   39.53          super(name, methodHandle, getMap(isStrict(flags)), scope, specs, flags);
   39.54          init(global);
   39.55      }
   39.56 @@ -107,7 +109,7 @@
   39.57       * @param specs specialized versions of this method, if available, null otherwise
   39.58       * @param flags {@link ScriptFunctionData} flags
   39.59       */
   39.60 -    ScriptFunctionImpl(final String name, final MethodHandle methodHandle, final ScriptObject scope, final MethodHandle[] specs, final int flags) {
   39.61 +    ScriptFunctionImpl(final String name, final MethodHandle methodHandle, final ScriptObject scope, final Specialization[] specs, final int flags) {
   39.62          this(name, methodHandle, scope, specs, flags, Global.instance());
   39.63      }
   39.64  
   39.65 @@ -184,7 +186,7 @@
   39.66          return new AnonymousFunction();
   39.67      }
   39.68  
   39.69 -    private static ScriptFunction makeFunction(final String name, final MethodHandle methodHandle, final MethodHandle[] specs, final int flags) {
   39.70 +    private static ScriptFunction makeFunction(final String name, final MethodHandle methodHandle, final Specialization[] specs, final int flags) {
   39.71          final ScriptFunctionImpl func = new ScriptFunctionImpl(name, methodHandle, null, specs, flags);
   39.72          func.setPrototype(UNDEFINED);
   39.73          // Non-constructor built-in functions do not have "prototype" property
   39.74 @@ -201,7 +203,7 @@
   39.75       * @param specs  specialized versions of function if available, null otherwise
   39.76       * @return new ScriptFunction
   39.77       */
   39.78 -    static ScriptFunction makeFunction(final String name, final MethodHandle methodHandle, final MethodHandle[] specs) {
   39.79 +    static ScriptFunction makeFunction(final String name, final MethodHandle methodHandle, final Specialization[] specs) {
   39.80          return makeFunction(name, methodHandle, specs, ScriptFunctionData.IS_BUILTIN);
   39.81      }
   39.82  

    40.1 --- a/src/jdk/nashorn/internal/objects/annotations/SpecializedConstructor.java	Wed Oct 01 12:22:12 2014 +0200
    40.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    40.3 @@ -1,47 +0,0 @@
    40.4 -/*
    40.5 - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
    40.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    40.7 - *
    40.8 - * This code is free software; you can redistribute it and/or modify it
    40.9 - * under the terms of the GNU General Public License version 2 only, as
   40.10 - * published by the Free Software Foundation.  Oracle designates this
   40.11 - * particular file as subject to the "Classpath" exception as provided
   40.12 - * by Oracle in the LICENSE file that accompanied this code.
   40.13 - *
   40.14 - * This code is distributed in the hope that it will be useful, but WITHOUT
   40.15 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   40.16 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   40.17 - * version 2 for more details (a copy is included in the LICENSE file that
   40.18 - * accompanied this code).
   40.19 - *
   40.20 - * You should have received a copy of the GNU General Public License version
   40.21 - * 2 along with this work; if not, write to the Free Software Foundation,
   40.22 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   40.23 - *
   40.24 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   40.25 - * or visit www.oracle.com if you need additional information or have any
   40.26 - * questions.
   40.27 - */
   40.28 -
   40.29 -package jdk.nashorn.internal.objects.annotations;
   40.30 -
   40.31 -import java.lang.annotation.ElementType;
   40.32 -import java.lang.annotation.Retention;
   40.33 -import java.lang.annotation.RetentionPolicy;
   40.34 -import java.lang.annotation.Target;
   40.35 -
   40.36 -/**
   40.37 - * The SpecializedConstructor annotation is used to flag more type specific constructors than the standard one in
   40.38 - * Native objects. For example {@link jdk.nashorn.internal.objects.NativeArray#construct} takes an arbitrary number of
   40.39 - * Object elements as an array. Call this constructor, including the varargs collector that allocates the array
   40.40 - * upon each invocation, is much more expensive than calling a specialized constructor that takes one arguments
   40.41 - * of, e.g. int type from the call site, such as
   40.42 - * {@link jdk.nashorn.internal.objects.NativeArray#construct(boolean, Object, int)}.
   40.43 - * {@link jdk.nashorn.internal.runtime.ScriptFunction} will try to look up the most specific function when
   40.44 - * linking the callsite.
   40.45 - */
   40.46 -@Retention(RetentionPolicy.RUNTIME)
   40.47 -@Target(ElementType.METHOD)
   40.48 -public @interface SpecializedConstructor {
   40.49 -    //empty
   40.50 -}

    41.1 --- a/src/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java	Wed Oct 01 12:22:12 2014 +0200
    41.2 +++ b/src/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java	Thu Sep 25 15:53:47 2014 +0200
    41.3 @@ -1,5 +1,5 @@
    41.4  /*
    41.5 - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
    41.6 + * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
    41.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    41.8   *
    41.9   * This code is free software; you can redistribute it and/or modify it
   41.10 @@ -29,18 +29,315 @@
   41.11  import java.lang.annotation.Retention;
   41.12  import java.lang.annotation.RetentionPolicy;
   41.13  import java.lang.annotation.Target;
   41.14 +import java.lang.invoke.MethodHandle;
   41.15 +import java.lang.invoke.SwitchPoint;
   41.16 +import jdk.internal.dynalink.CallSiteDescriptor;
   41.17 +import jdk.internal.dynalink.linker.LinkRequest;
   41.18 +import jdk.nashorn.internal.runtime.ScriptFunction;
   41.19  
   41.20  /**
   41.21 - * The SpecializedFunction annotation is used to flag more type specific functions than the standard one in
   41.22 - * Native objects. For example {@link jdk.nashorn.internal.objects.NativeMath#max} takes an arbitrary number of
   41.23 - * Object elements as an array. Call this function, including the varargs collector that allocates the array
   41.24 - * upon each invocation, is much more expensive than calling a specialized function that takes two arguments
   41.25 - * of, e.g. int type from the call site, such as {@link jdk.nashorn.internal.objects.NativeMath#max(Object, int, int)}.
   41.26 - * {@link jdk.nashorn.internal.runtime.ScriptFunction} will try to look up the most specific function when
   41.27 - * linking the callsite.
   41.28 + * The SpecializedFunction annotation is used to flag more type specific
   41.29 + * functions than the standard one in the native objects
   41.30   */
   41.31  @Retention(RetentionPolicy.RUNTIME)
   41.32  @Target(ElementType.METHOD)
   41.33  public @interface SpecializedFunction {
   41.34 -    //empty
   41.35 +
   41.36 +    /**
   41.37 +     * Functionality for testing if we are allowed to link a specialized
   41.38 +     * function the first time we encounter it. Then the guard will handle the
   41.39 +     * rest of the invocations
   41.40 +     *
   41.41 +     * This is the same for all callsites in Nashorn, the first time callsite is
   41.42 +     * linked, we have to manually check that the linkage is OK. Even if we add
   41.43 +     * a guard and it fails upon the first try, this is not good enough.
   41.44 +     * (Symmetrical to how it works everywhere else in the Nashorn runtime).
   41.45 +     *
   41.46 +     * Here we abstract out a few of the most common link guard checks.
   41.47 +     */
   41.48 +    public static abstract class LinkLogic {
   41.49 +        /**
   41.50 +         * Empty link logic instance - this is the default
   41.51 +         * "no special linking or runtime guard behavior"
   41.52 +         */
   41.53 +        public static final LinkLogic EMPTY_INSTANCE = new Empty();
   41.54 +
   41.55 +        private static final SwitchPoint[] INVALIDATED_SWITCHPOINTS = new SwitchPoint[0];
   41.56 +
   41.57 +        private SwitchPoint[] modificationSwitchPoints; //cache
   41.58 +
   41.59 +        /** Empty link logic class - allow all linking, no guards */
   41.60 +        private static final class Empty extends LinkLogic {
   41.61 +            @Override
   41.62 +            public boolean canLink(final Object self, final CallSiteDescriptor desc, final LinkRequest request) {
   41.63 +                return true;
   41.64 +            }
   41.65 +
   41.66 +            @Override
   41.67 +            public boolean isEmpty() {
   41.68 +                return true;
   41.69 +            }
   41.70 +        }
   41.71 +
   41.72 +        /**
   41.73 +         * Get the class representing the empty link logic
   41.74 +         * @return class representing empty link logic
   41.75 +         */
   41.76 +        public static Class<? extends LinkLogic> getEmptyLinkLogicClass() {
   41.77 +            return Empty.class;
   41.78 +        }
   41.79 +
   41.80 +        /**
   41.81 +         * Should this callsite relink when an exception is thrown
   41.82 +         *
   41.83 +         * @return the relink exception, or null if none
   41.84 +         */
   41.85 +        public Class<? extends Throwable> getRelinkException() {
   41.86 +            return null;
   41.87 +        }
   41.88 +
   41.89 +        /**
   41.90 +         * Is this link logic class empty - i.e. no special linking logic
   41.91 +         * supplied
   41.92 +         *
   41.93 +         * @param clazz class to check
   41.94 +         *
   41.95 +         * @return true if this link logic is empty
   41.96 +         */
   41.97 +        public static boolean isEmpty(final Class<? extends LinkLogic> clazz) {
   41.98 +            return clazz == Empty.class;
   41.99 +        }
  41.100 +
  41.101 +        /**
  41.102 +         * Is this link logic instance empty - i.e. no special linking logic
  41.103 +         * supplied
  41.104 +         *
  41.105 +         * @return true if this link logic instance is empty
  41.106 +         */
  41.107 +        public boolean isEmpty() {
  41.108 +            return false;
  41.109 +        }
  41.110 +
  41.111 +        /**
  41.112 +         * Given a callsite, can we link this method based on the receiver and
  41.113 +         * parameters?
  41.114 +         *
  41.115 +         * @param self    receiver
  41.116 +         * @param desc    callsite descriptor
  41.117 +         * @param request link request
  41.118 +         *
  41.119 +         * @return true if we can link this callsite at this time
  41.120 +         */
  41.121 +        public abstract boolean canLink(final Object self, final CallSiteDescriptor desc, final LinkRequest request);
  41.122 +
  41.123 +        /**
  41.124 +         * Given a callsite, do we require an extra guard for specialization to
  41.125 +         * go through?
  41.126 +         *
  41.127 +         * @param self receiver
  41.128 +         *
  41.129 +         * @return true if a guard is to be woven into the callsite
  41.130 +         */
  41.131 +        public boolean needsGuard(final Object self) {
  41.132 +            return true;
  41.133 +        }
  41.134 +
  41.135 +        /**
  41.136 +         * Given a callsite, and optional arguments, do we need an extra guard
  41.137 +         * for specialization to go through - this guard can be a function of
  41.138 +         * the arguments too
  41.139 +         *
  41.140 +         * @param self receiver
  41.141 +         * @param args arguments
  41.142 +         *
  41.143 +         * @return true if a guard is to be woven into the callsite
  41.144 +         */
  41.145 +        public boolean needsGuard(final Object self, final Object... args) {
  41.146 +            return true;
  41.147 +        }
  41.148 +
  41.149 +        /**
  41.150 +         * Given a callsite, and optional arguments, return any extra guard we
  41.151 +         * might need for specialization as a method handle.
  41.152 +         *
  41.153 +         * @return methodhandle for guard, or null if no guard is needed
  41.154 +         */
  41.155 +        public MethodHandle getGuard() {
  41.156 +            return null;
  41.157 +        }
  41.158 +
  41.159 +        /**
  41.160 +         * Return the modification SwitchPoint of a particular index from this OptimisticBuiltins
  41.161 +         * If none exists, one is created and that one is return.
  41.162 +         *
  41.163 +         * The implementor must map indexes to specific SwitchPoints for specific events and keep
  41.164 +         * track of what they mean, for example NativeArray.LENGTH_NOT_WRITABLE_SWITCHPOINT
  41.165 +         * might be a useful index mapping
  41.166 +         *
  41.167 +         * @param index index for SwitchPoint to get or create
  41.168 +         * @return modification SwitchPoint of particular index for the receiver
  41.169 +         */
  41.170 +        public SwitchPoint getOrCreateModificationSwitchPoint(final int index) {
  41.171 +            return null;
  41.172 +        }
  41.173 +
  41.174 +        /**
  41.175 +         * Return the modification SwitchPoint from this OptimisticBuiltins. If none
  41.176 +         * exists, one is created and that one is return.
  41.177 +         *
  41.178 +         * @return modification SwitchPoint for the receiver
  41.179 +         */
  41.180 +        public SwitchPoint[] getOrCreateModificationSwitchPoints() {
  41.181 +            return null;
  41.182 +        }
  41.183 +
  41.184 +        /**
  41.185 +         * Hook to invalidate a modification SwitchPoint by index.
  41.186 +         *
  41.187 +         * @param index index for SwitchPoint to invalidate
  41.188 +         */
  41.189 +        public void invalidateModificationSwitchPoint(final int index) {
  41.190 +            //empty
  41.191 +        }
  41.192 +
  41.193 +        /**
  41.194 +         * Hook to invalidate all modification SwitchPoints for a receiver
  41.195 +         */
  41.196 +        public void invalidateModificationSwitchPoints() {
  41.197 +            //empty
  41.198 +        }
  41.199 +
  41.200 +        /**
  41.201 +         * Check whether the receiver has an invalidated modification SwitchPoint.
  41.202 +         *
  41.203 +         * @param  index index for the modification SwitchPoint
  41.204 +         * @return true if the particular SwitchPoint at the index is invalidated
  41.205 +         */
  41.206 +        public boolean hasInvalidatedModificationSwitchPoint(final int index) {
  41.207 +            return false;
  41.208 +        }
  41.209 +
  41.210 +        /**
  41.211 +         * Check whether at least one of the modification SwitchPoints has been
  41.212 +         * invalidated
  41.213 +         * @return true if one of the SwitchPoints has been invalidated
  41.214 +         */
  41.215 +        public boolean hasInvalidatedModificationSwitchPoints() {
  41.216 +            return false;
  41.217 +        }
  41.218 +
  41.219 +        /**
  41.220 +         * Check whether this OptimisticBuiltins has a SwitchPoints of particular
  41.221 +         * index.
  41.222 +         *
  41.223 +         * As creation overhead for a SwitchPoint is non-zero, we have to create them lazily instead of,
  41.224 +         * e.g. in the constructor of every subclass.
  41.225 +         *
  41.226 +         * @param index index for the modification SwitchPoint
  41.227 +         * @return true if a modification SwitchPoint exists, no matter if it has been invalidated or not
  41.228 +         */
  41.229 +        public boolean hasModificationSwitchPoint(final int index) {
  41.230 +            return false;
  41.231 +        }
  41.232 +
  41.233 +        /**
  41.234 +         * Check whether this OptimisticBuiltins has SwitchPoints.
  41.235 +         *
  41.236 +         * As creation overhead for a SwitchPoint is non-zero, we have to create them lazily instead of,
  41.237 +         * e.g. in the constructor of every subclass.
  41.238 +         *
  41.239 +         * @return true if a modification SwitchPoint exists, no matter if it has been invalidated or not
  41.240 +         */
  41.241 +        public boolean hasModificationSwitchPoints() {
  41.242 +            return false;
  41.243 +        }
  41.244 +
  41.245 +        /**
  41.246 +         * Check, given a link request and a receiver, if this specialization
  41.247 +         * fits This is used by the linker in {@link ScriptFunction} to figure
  41.248 +         * out if an optimistic builtin can be linked when first discovered
  41.249 +         *
  41.250 +         * @param self receiver
  41.251 +         * @param desc callsite descriptor
  41.252 +         * @param request link request
  41.253 +
  41.254 +         * @return true if we can link, false otherwise - that means we have to
  41.255 +         *         pick a non specialized target
  41.256 +         */
  41.257 +        public boolean checkLinkable(final Object self, final CallSiteDescriptor desc, final LinkRequest request) {
  41.258 +            // no matter what the modification switchpoints are, if any of them are invalidated,
  41.259 +            // we can't link. Side effect is that if it's the first time we see this callsite,
  41.260 +            // we have to create the SwitchPoint(s) so future modification switchpoint invalidations
  41.261 +            // relink it
  41.262 +            final SwitchPoint[] sps = getOrCreateModificationSwitchPoints(self);
  41.263 +            if (sps == INVALIDATED_SWITCHPOINTS) {
  41.264 +                // nope, can't do the fast link as this assumption
  41.265 +                // has been invalidated already, e.g. length of an
  41.266 +                // array set to not writable
  41.267 +                return false;
  41.268 +            }
  41.269 +            modificationSwitchPoints = sps; //cache
  41.270 +
  41.271 +            // check the link guard, if it says we can link, go ahead
  41.272 +            return canLink(self, desc, request);
  41.273 +        }
  41.274 +
  41.275 +        private SwitchPoint[] getOrCreateModificationSwitchPoints(final Object self) {
  41.276 +            final SwitchPoint[] sps = getOrCreateModificationSwitchPoints(); //ask for all my switchpoints
  41.277 +            if (sps != null) { //switchpoint exists, but some may be invalidated
  41.278 +                for (final SwitchPoint sp : sps) {
  41.279 +                    if (sp.hasBeenInvalidated()) {
  41.280 +                        return INVALIDATED_SWITCHPOINTS;
  41.281 +                    }
  41.282 +                }
  41.283 +            }
  41.284 +            return sps;
  41.285 +        }
  41.286 +
  41.287 +        /**
  41.288 +         * Get the cached modification switchpoints. Only possible to do after a link
  41.289 +         * check call has been performed, one that has answered "true", or you will get the
  41.290 +         * wrong information.
  41.291 +         *
  41.292 +         * Should be used only from {@link ScriptFunction#findCallMethod}
  41.293 +         *
  41.294 +         * @return cached modification switchpoints for this callsite, null if none
  41.295 +         */
  41.296 +        public SwitchPoint[] getModificationSwitchPoints() {
  41.297 +            return modificationSwitchPoints == null ? null : modificationSwitchPoints.clone();
  41.298 +        }
  41.299 +    }
  41.300 +
  41.301 +    /**
  41.302 +     * name override for return value polymorphism, for example we can't have
  41.303 +     * pop(V)I and pop(V)D in the same Java class, so they need to be named,
  41.304 +     * e.g. popInt(V)I and popDouble(V)D for disambiguation, however, their
  41.305 +     * names still need to resolve to "pop" to JavaScript so we can still
  41.306 +     * specialize on return values and so that the linker can find them
  41.307 +     *
  41.308 +     * @return name, "" means no override, use the Java function name, e.g.
  41.309 +     *         "push"
  41.310 +     */
  41.311 +    String name() default "";
  41.312 +
  41.313 +    /**
  41.314 +     * Return the guard for this specialized function. The default is no guard.
  41.315 +     *
  41.316 +     * @return guard
  41.317 +     */
  41.318 +    Class<?> linkLogic() default LinkLogic.Empty.class;
  41.319 +
  41.320 +    /**
  41.321 +     * Is this a specialized constructor?
  41.322 +     */
  41.323 +    boolean isConstructor() default false;
  41.324 +
  41.325 +    /**
  41.326 +     * Can this function throw UnwarrantedOptimismExceptions? This works just
  41.327 +     * like the normal functions, but we need the function to be
  41.328 +     * immutable/non-state modifying, as we can't generate continuations for
  41.329 +     * native code. Luckily a lot of the methods we want to specialize have this
  41.330 +     * property
  41.331 +     */
  41.332 +    boolean isOptimistic() default false;
  41.333  }

    42.1 --- a/src/jdk/nashorn/internal/runtime/AccessorProperty.java	Wed Oct 01 12:22:12 2014 +0200
    42.2 +++ b/src/jdk/nashorn/internal/runtime/AccessorProperty.java	Thu Sep 25 15:53:47 2014 +0200
    42.3 @@ -36,7 +36,6 @@
    42.4  import static jdk.nashorn.internal.runtime.JSType.getAccessorTypeIndex;
    42.5  import static jdk.nashorn.internal.runtime.JSType.getNumberOfAccessorTypes;
    42.6  import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
    42.7 -
    42.8  import java.io.IOException;
    42.9  import java.io.ObjectInputStream;
   42.10  import java.lang.invoke.MethodHandle;
   42.11 @@ -57,9 +56,7 @@
   42.12      private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
   42.13  
   42.14      private static final MethodHandle REPLACE_MAP   = findOwnMH_S("replaceMap", Object.class, Object.class, PropertyMap.class);
   42.15 -    private static final MethodHandle INVALIDATE_SP = findOwnMH_S("invalidateSwitchPoint", Object.class, Object.class, SwitchPoint.class);
   42.16 -
   42.17 -    private static final SwitchPoint NO_CHANGE_CALLBACK = new SwitchPoint();
   42.18 +    private static final MethodHandle INVALIDATE_SP = findOwnMH_S("invalidateSwitchPoint", Object.class, AccessorProperty.class, Object.class);
   42.19  
   42.20      private static final int NOOF_TYPES = getNumberOfAccessorTypes();
   42.21      private static final long serialVersionUID = 3371720170182154920L;
   42.22 @@ -221,7 +218,7 @@
   42.23       * @param setter the property setter or null if non writable, non configurable
   42.24       */
   42.25      private AccessorProperty(final String key, final int flags, final int slot, final MethodHandle getter, final MethodHandle setter) {
   42.26 -        super(key, flags | (getter.type().returnType().isPrimitive() ? IS_NASGEN_PRIMITIVE : 0), slot);
   42.27 +        super(key, flags | IS_BUILTIN | (getter.type().returnType().isPrimitive() ? IS_NASGEN_PRIMITIVE : 0), slot);
   42.28          assert !isSpill();
   42.29  
   42.30          // we don't need to prep the setters these will never be invalidated as this is a nasgen
   42.31 @@ -602,7 +599,6 @@
   42.32  
   42.33      private Property getWiderProperty(final Class<?> type) {
   42.34          return copy(type); //invalidate cache of new property
   42.35 -
   42.36      }
   42.37  
   42.38      private PropertyMap getWiderMap(final PropertyMap oldMap, final Property newProperty) {
   42.39 @@ -627,8 +623,10 @@
   42.40      }
   42.41  
   42.42      @SuppressWarnings("unused")
   42.43 -    private static Object invalidateSwitchPoint(final Object obj, final SwitchPoint sp) {
   42.44 -        SwitchPoint.invalidateAll(new SwitchPoint[] { sp });
   42.45 +    private static Object invalidateSwitchPoint(final AccessorProperty property, final Object obj) {
   42.46 +         if (!property.builtinSwitchPoint.hasBeenInvalidated()) {
   42.47 +            SwitchPoint.invalidateAll(new SwitchPoint[] { property.builtinSwitchPoint });
   42.48 +        }
   42.49          return obj;
   42.50      }
   42.51  
   42.52 @@ -668,12 +666,8 @@
   42.53              mh = generateSetter(!forType.isPrimitive() ? Object.class : forType, type);
   42.54          }
   42.55  
   42.56 -        /**
   42.57 -         * Check if this is a special global name that requires switchpoint invalidation
   42.58 -         */
   42.59 -        final SwitchPoint ccb = getChangeCallback();
   42.60 -        if (ccb != null && ccb != NO_CHANGE_CALLBACK) {
   42.61 -            mh = MH.filterArguments(mh, 0, MH.insertArguments(debugInvalidate(getKey(), ccb), 1, changeCallback));
   42.62 +        if (isBuiltin()) {
   42.63 +           mh = MH.filterArguments(mh, 0, debugInvalidate(MH.insertArguments(INVALIDATE_SP, 0, this), getKey()));
   42.64          }
   42.65  
   42.66          assert mh.type().returnType() == void.class : mh.type();
   42.67 @@ -681,25 +675,6 @@
   42.68          return mh;
   42.69      }
   42.70  
   42.71 -    /**
   42.72 -     * Get the change callback for this property
   42.73 -     * @return switchpoint that is invalidated when property changes
   42.74 -     */
   42.75 -    protected SwitchPoint getChangeCallback() {
   42.76 -        if (changeCallback == null) {
   42.77 -            try {
   42.78 -                changeCallback = Global.instance().getChangeCallback(getKey());
   42.79 -            } catch (final NullPointerException e) {
   42.80 -                assert !"apply".equals(getKey()) && !"call".equals(getKey());
   42.81 -                //empty
   42.82 -            }
   42.83 -            if (changeCallback == null) {
   42.84 -                changeCallback = NO_CHANGE_CALLBACK;
   42.85 -            }
   42.86 -        }
   42.87 -        return changeCallback;
   42.88 -    }
   42.89 -
   42.90      @Override
   42.91      public final boolean canChangeType() {
   42.92          if (OBJECT_FIELDS_ONLY) {
   42.93 @@ -724,7 +699,6 @@
   42.94          return currentType;
   42.95      }
   42.96  
   42.97 -
   42.98      private MethodHandle debug(final MethodHandle mh, final Class<?> forType, final Class<?> type, final String tag) {
   42.99          if (!Context.DEBUG || !Global.hasInstance()) {
  42.100              return mh;
  42.101 @@ -780,9 +754,9 @@
  42.102          return mh;
  42.103      }
  42.104  
  42.105 -    private static MethodHandle debugInvalidate(final String key, final SwitchPoint sp) {
  42.106 +    private static MethodHandle debugInvalidate(final MethodHandle invalidator, final String key) {
  42.107          if (!Context.DEBUG || !Global.hasInstance()) {
  42.108 -            return INVALIDATE_SP;
  42.109 +            return invalidator;
  42.110          }
  42.111  
  42.112          final Context context = Context.getContextTrusted();
  42.113 @@ -790,11 +764,11 @@
  42.114  
  42.115          return context.addLoggingToHandle(
  42.116                  ObjectClassGenerator.class,
  42.117 -                INVALIDATE_SP,
  42.118 +                invalidator,
  42.119                  new Supplier<String>() {
  42.120                      @Override
  42.121                      public String get() {
  42.122 -                        return "Field change callback for " + key + " triggered: " + sp;
  42.123 +                        return "Field change callback for " + key + " triggered ";
  42.124                      }
  42.125                  });
  42.126      }

    43.1 --- a/src/jdk/nashorn/internal/runtime/CodeInstaller.java	Wed Oct 01 12:22:12 2014 +0200
    43.2 +++ b/src/jdk/nashorn/internal/runtime/CodeInstaller.java	Thu Sep 25 15:53:47 2014 +0200
    43.3 @@ -81,13 +81,17 @@
    43.4  
    43.5      /**
    43.6       * Store a compiled script for later reuse
    43.7 +     *
    43.8 +     * @param cacheKey key to use in cache
    43.9       * @param source the script source
   43.10       * @param mainClassName the main class name
   43.11       * @param classBytes map of class names to class bytes
   43.12 +     * @param initializers compilation id -> FunctionInitializer map
   43.13       * @param constants constants array
   43.14 +     * @param compilationId compilation id
   43.15       */
   43.16 -    public void storeScript(String cacheKey, Source source, String mainClassName, Map<String, byte[]> classBytes,
   43.17 -                            Map<Integer, FunctionInitializer> initializers, Object[] constants, int compilationId);
   43.18 +    public void storeScript(final String cacheKey, final Source source, final String mainClassName, final Map<String, byte[]> classBytes,
   43.19 +            final Map<Integer, FunctionInitializer> initializers, final Object[] constants, final int compilationId);
   43.20  
   43.21      /**
   43.22       * Load a previously compiled script

    44.1 --- a/src/jdk/nashorn/internal/runtime/CodeStore.java	Wed Oct 01 12:22:12 2014 +0200
    44.2 +++ b/src/jdk/nashorn/internal/runtime/CodeStore.java	Thu Sep 25 15:53:47 2014 +0200
    44.3 @@ -118,6 +118,8 @@
    44.4       * @param initializers  the function initializers
    44.5       * @param constants     the constants array
    44.6       * @param compilationId the compilation id
    44.7 +     *
    44.8 +     * @return stored script
    44.9       */
   44.10      public StoredScript store(final String functionKey,
   44.11                                final Source source,
   44.12 @@ -153,11 +155,13 @@
   44.13      /**
   44.14       * Returns a new StoredScript instance.
   44.15       *
   44.16 +     * @param source the source
   44.17       * @param mainClassName the main class name
   44.18       * @param classBytes a map of class bytes
   44.19       * @param initializers function initializers
   44.20       * @param constants the constants array
   44.21       * @param compilationId the compilation id
   44.22 +     *
   44.23       * @return The compiled script
   44.24       */
   44.25      public StoredScript storedScriptFor(final Source source, final String mainClassName,
   44.26 @@ -206,7 +210,7 @@
   44.27          /**
   44.28           * Constructor
   44.29           *
   44.30 -         * @throws IOException
   44.31 +         * @throws IOException if there are read/write problems with the cache and cache directory
   44.32           */
   44.33          public DirectoryCodeStore() throws IOException {
   44.34              this(Options.getStringProperty("nashorn.persistent.code.cache", "nashorn_code_cache"), false, DEFAULT_MIN_SIZE);
   44.35 @@ -216,8 +220,9 @@
   44.36           * Constructor
   44.37           *
   44.38           * @param path    directory to store code in
   44.39 +         * @param readOnly is this a read only code store
   44.40           * @param minSize minimum file size for caching scripts
   44.41 -         * @throws IOException
   44.42 +         * @throws IOException if there are read/write problems with the cache and cache directory
   44.43           */
   44.44          public DirectoryCodeStore(final String path, final boolean readOnly, final int minSize) throws IOException {
   44.45              this.dir = checkDirectory(path, readOnly);

    45.1 --- a/src/jdk/nashorn/internal/runtime/CompiledFunction.java	Wed Oct 01 12:22:12 2014 +0200
    45.2 +++ b/src/jdk/nashorn/internal/runtime/CompiledFunction.java	Thu Sep 25 15:53:47 2014 +0200
    45.3 @@ -33,12 +33,13 @@
    45.4  import java.lang.invoke.MethodType;
    45.5  import java.lang.invoke.MutableCallSite;
    45.6  import java.lang.invoke.SwitchPoint;
    45.7 +import java.util.Collection;
    45.8 +import java.util.Collections;
    45.9  import java.util.Iterator;
   45.10  import java.util.Map;
   45.11  import java.util.TreeMap;
   45.12  import java.util.function.Supplier;
   45.13  import java.util.logging.Level;
   45.14 -
   45.15  import jdk.internal.dynalink.linker.GuardedInvocation;
   45.16  import jdk.nashorn.internal.codegen.Compiler;
   45.17  import jdk.nashorn.internal.codegen.Compiler.CompilationPhases;
   45.18 @@ -46,6 +47,7 @@
   45.19  import jdk.nashorn.internal.codegen.types.ArrayType;
   45.20  import jdk.nashorn.internal.codegen.types.Type;
   45.21  import jdk.nashorn.internal.ir.FunctionNode;
   45.22 +import jdk.nashorn.internal.objects.annotations.SpecializedFunction.LinkLogic;
   45.23  import jdk.nashorn.internal.runtime.events.RecompilationEvent;
   45.24  import jdk.nashorn.internal.runtime.linker.Bootstrap;
   45.25  import jdk.nashorn.internal.runtime.logging.DebugLogger;
   45.26 @@ -63,6 +65,8 @@
   45.27  
   45.28      private final DebugLogger log;
   45.29  
   45.30 +    static final Collection<CompiledFunction> NO_FUNCTIONS = Collections.emptySet();
   45.31 +
   45.32      /**
   45.33       * The method type may be more specific than the invoker, if. e.g.
   45.34       * the invoker is guarded, and a guard with a generic object only
   45.35 @@ -75,19 +79,38 @@
   45.36      private final int flags; // from FunctionNode
   45.37      private final MethodType callSiteType;
   45.38  
   45.39 +    private final Specialization specialization;
   45.40 +
   45.41      CompiledFunction(final MethodHandle invoker) {
   45.42 -        this(invoker, null);
   45.43 +        this(invoker, null, null);
   45.44      }
   45.45  
   45.46 -    static CompiledFunction createBuiltInConstructor(final MethodHandle invoker) {
   45.47 -        return new CompiledFunction(MH.insertArguments(invoker, 0, false), createConstructorFromInvoker(MH.insertArguments(invoker, 0, true)));
   45.48 +    static CompiledFunction createBuiltInConstructor(final MethodHandle invoker, final Specialization specialization) {
   45.49 +        return new CompiledFunction(MH.insertArguments(invoker, 0, false), createConstructorFromInvoker(MH.insertArguments(invoker, 0, true)), specialization);
   45.50      }
   45.51  
   45.52 -    CompiledFunction(final MethodHandle invoker, final MethodHandle constructor) {
   45.53 -        this(invoker, constructor, 0, null, DebugLogger.DISABLED_LOGGER);
   45.54 +    CompiledFunction(final MethodHandle invoker, final MethodHandle constructor, final Specialization specialization) {
   45.55 +        this(invoker, constructor, 0, null, specialization, DebugLogger.DISABLED_LOGGER);
   45.56      }
   45.57  
   45.58 -    CompiledFunction(final MethodHandle invoker, final MethodHandle constructor, final int flags, final MethodType callSiteType, final DebugLogger log) {
   45.59 +    CompiledFunction(final MethodHandle invoker, final MethodHandle constructor, final int flags, final MethodType callSiteType, final Specialization specialization, final DebugLogger log) {
   45.60 +        this.specialization = specialization;
   45.61 +        if (specialization != null && specialization.isOptimistic()) {
   45.62 +            /*
   45.63 +             * An optimistic builtin with isOptimistic=true works like any optimistic generated function, i.e. it
   45.64 +             * can throw unwarranted optimism exceptions. As native functions trivially can't have parts of them
   45.65 +             * regenerated as restof methods, this only works if the methods are atomic/functional in their behavior
   45.66 +             * and doesn't modify state before an UOE can be thrown. If they aren't, we can reexecute a wider version
   45.67 +             * of the same builtin in a recompilation handler for FinalScriptFunctionData. There are several
   45.68 +             * candidate methods in Native* that would benefit from this, but I haven't had time to implement any
   45.69 +             * of them currently. In order to fit in with the relinking framework, the current thinking is
   45.70 +             * that the methods still take a program point to fit in with other optimistic functions, but
   45.71 +             * it is set to "first", which is the beginning of the method. The relinker can tell the difference
   45.72 +             * between builtin and JavaScript functions. This might change. TODO
   45.73 +             */
   45.74 +            this.invoker = MH.insertArguments(invoker, invoker.type().parameterCount() - 1, UnwarrantedOptimismException.FIRST_PROGRAM_POINT);
   45.75 +            throw new AssertionError("Optimistic (UnwarrantedOptimismException throwing) builtin functions are currently not in use");
   45.76 +        }
   45.77          this.invoker = invoker;
   45.78          this.constructor = constructor;
   45.79          this.flags = flags;
   45.80 @@ -97,7 +120,7 @@
   45.81  
   45.82      CompiledFunction(final MethodHandle invoker, final RecompilableScriptFunctionData functionData,
   45.83              final Map<Integer, Type> invalidatedProgramPoints, final MethodType callSiteType, final int flags) {
   45.84 -        this(invoker, null, flags, callSiteType, functionData.getLogger());
   45.85 +        this(invoker, null, flags, callSiteType, null, functionData.getLogger());
   45.86          if ((flags & FunctionNode.IS_DEOPTIMIZABLE) != 0) {
   45.87              optimismInfo = new OptimismInfo(functionData, invalidatedProgramPoints);
   45.88          } else {
   45.89 @@ -105,10 +128,45 @@
   45.90          }
   45.91      }
   45.92  
   45.93 +    static CompiledFunction createBuiltInConstructor(final MethodHandle invoker) {
   45.94 +        return new CompiledFunction(MH.insertArguments(invoker, 0, false), createConstructorFromInvoker(MH.insertArguments(invoker, 0, true)), null);
   45.95 +    }
   45.96 +
   45.97 +    boolean isSpecialization() {
   45.98 +        return specialization != null;
   45.99 +    }
  45.100 +
  45.101 +    boolean hasLinkLogic() {
  45.102 +        return getLinkLogicClass() != null;
  45.103 +    }
  45.104 +
  45.105 +    Class<? extends LinkLogic> getLinkLogicClass() {
  45.106 +        if (isSpecialization()) {
  45.107 +            final Class<? extends LinkLogic> linkLogicClass = specialization.getLinkLogicClass();
  45.108 +            assert !LinkLogic.isEmpty(linkLogicClass) : "empty link logic classes should have been removed by nasgen";
  45.109 +            return linkLogicClass;
  45.110 +        }
  45.111 +        return null;
  45.112 +    }
  45.113 +
  45.114      int getFlags() {
  45.115          return flags;
  45.116      }
  45.117  
  45.118 +    /**
  45.119 +     * An optimistic specialization is one that can throw UnwarrantedOptimismException.
  45.120 +     * This is allowed for native methods, as long as they are functional, i.e. don't change
  45.121 +     * any state between entering and throwing the UOE. Then we can re-execute a wider version
  45.122 +     * of the method in the continuation. Rest-of method generation for optimistic builtins is
  45.123 +     * of course not possible, but this approach works and fits into the same relinking
  45.124 +     * framework
  45.125 +     *
  45.126 +     * @return true if optimistic builtin
  45.127 +     */
  45.128 +    boolean isOptimistic() {
  45.129 +        return isSpecialization() ? specialization.isOptimistic() : false;
  45.130 +    }
  45.131 +
  45.132      boolean isApplyToCall() {
  45.133          return (flags & FunctionNode.HAS_APPLY_TO_CALL_SPECIALIZATION) != 0;
  45.134      }
  45.135 @@ -119,7 +177,19 @@
  45.136  
  45.137      @Override
  45.138      public String toString() {
  45.139 -        return "[invokerType=" + invoker.type() + " ctor=" + constructor + " weight=" + weight() + " isApplyToCall=" + isApplyToCall() + "]";
  45.140 +        final StringBuilder sb = new StringBuilder();
  45.141 +        final Class<? extends LinkLogic> linkLogicClass = getLinkLogicClass();
  45.142 +
  45.143 +        sb.append("[invokerType=").
  45.144 +            append(invoker.type()).
  45.145 +            append(" ctor=").
  45.146 +            append(constructor).
  45.147 +            append(" weight=").
  45.148 +            append(weight()).
  45.149 +            append(" linkLogic=").
  45.150 +            append(linkLogicClass != null ? linkLogicClass.getSimpleName() : "none");
  45.151 +
  45.152 +        return sb.toString();
  45.153      }
  45.154  
  45.155      boolean needsCallee() {
  45.156 @@ -281,10 +351,12 @@
  45.157          if (other == null) {
  45.158              return true;
  45.159          }
  45.160 -        return betterThanFinal(type(), other.type(), callSiteMethodType);
  45.161 +        return betterThanFinal(this, other, callSiteMethodType);
  45.162      }
  45.163  
  45.164 -    static boolean betterThanFinal(final MethodType thisMethodType, final MethodType otherMethodType, final MethodType callSiteMethodType) {
  45.165 +    private static boolean betterThanFinal(final CompiledFunction cf, final CompiledFunction other, final MethodType callSiteMethodType) {
  45.166 +        final MethodType thisMethodType  = cf.type();
  45.167 +        final MethodType otherMethodType = other.type();
  45.168          final int thisParamCount = getParamCount(thisMethodType);
  45.169          final int otherParamCount = getParamCount(otherMethodType);
  45.170          final int callSiteRawParamCount = getParamCount(callSiteMethodType);
  45.171 @@ -406,7 +478,17 @@
  45.172              return false;
  45.173          }
  45.174  
  45.175 -        throw new AssertionError(thisMethodType + " identically applicable to " + otherMethodType + " for " + callSiteMethodType); // Signatures are identical
  45.176 +        //if they are equal, pick the specialized one first
  45.177 +        if (cf.isSpecialization() != other.isSpecialization()) {
  45.178 +            return cf.isSpecialization(); //always pick the specialized version if we can
  45.179 +        }
  45.180 +
  45.181 +        if (cf.isSpecialization() && other.isSpecialization()) {
  45.182 +            return cf.getLinkLogicClass() != null; //pick link logic specialization above generic specializations
  45.183 +        }
  45.184 +
  45.185 +        // Signatures are identical
  45.186 +        throw new AssertionError(thisMethodType + " identically applicable to " + otherMethodType + " for " + callSiteMethodType);
  45.187      }
  45.188  
  45.189      private static Type[] toTypeWithoutCallee(final MethodType type, final int thisIndex) {
  45.190 @@ -427,8 +509,8 @@
  45.191          return ((ArrayType)paramTypes[paramTypes.length - 1]).getElementType();
  45.192      }
  45.193  
  45.194 -    boolean matchesCallSite(final MethodType callSiteType, final boolean pickVarArg) {
  45.195 -        if (callSiteType.equals(this.callSiteType)) {
  45.196 +    boolean matchesCallSite(final MethodType other, final boolean pickVarArg) {
  45.197 +        if (other.equals(this.callSiteType)) {
  45.198              return true;
  45.199          }
  45.200          final MethodType type  = type();
  45.201 @@ -438,7 +520,7 @@
  45.202              return pickVarArg;
  45.203          }
  45.204  
  45.205 -        final int csParamCount = getParamCount(callSiteType);
  45.206 +        final int csParamCount = getParamCount(other);
  45.207          final boolean csIsVarArg = csParamCount == Integer.MAX_VALUE;
  45.208          final int thisThisIndex = needsCallee() ? 1 : 0; // Index of "this" parameter in this function's type
  45.209  
  45.210 @@ -447,7 +529,7 @@
  45.211          // We must match all incoming parameters, except "this". Starting from 1 to skip "this".
  45.212          for(int i = 1; i < minParams; ++i) {
  45.213              final Type fnType = Type.typeFor(type.parameterType(i + thisThisIndex));
  45.214 -            final Type csType = csIsVarArg ? Type.OBJECT : Type.typeFor(callSiteType.parameterType(i + 1));
  45.215 +            final Type csType = csIsVarArg ? Type.OBJECT : Type.typeFor(other.parameterType(i + 1));
  45.216              if(!fnType.isEquivalentTo(csType)) {
  45.217                  return false;
  45.218              }
  45.219 @@ -669,9 +751,9 @@
  45.220          return sb.toString();
  45.221      }
  45.222  
  45.223 -    private void logRecompile(final String reason, final FunctionNode fn, final MethodType callSiteType, final Map<Integer, Type> ipp) {
  45.224 +    private void logRecompile(final String reason, final FunctionNode fn, final MethodType type, final Map<Integer, Type> ipp) {
  45.225          if (log.isEnabled()) {
  45.226 -            log.info(reason, DebugLogger.quote(fn.getName()), " signature: ", callSiteType, " ", toStringInvalidations(ipp));
  45.227 +            log.info(reason, DebugLogger.quote(fn.getName()), " signature: ", type, " ", toStringInvalidations(ipp));
  45.228          }
  45.229      }
  45.230  

    46.1 --- a/src/jdk/nashorn/internal/runtime/Context.java	Wed Oct 01 12:22:12 2014 +0200
    46.2 +++ b/src/jdk/nashorn/internal/runtime/Context.java	Thu Sep 25 15:53:47 2014 +0200
    46.3 @@ -33,13 +33,13 @@
    46.4  import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
    46.5  import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
    46.6  import static jdk.nashorn.internal.runtime.Source.sourceFor;
    46.7 -
    46.8  import java.io.File;
    46.9  import java.io.IOException;
   46.10  import java.io.PrintWriter;
   46.11  import java.lang.invoke.MethodHandle;
   46.12  import java.lang.invoke.MethodHandles;
   46.13  import java.lang.invoke.MethodType;
   46.14 +import java.lang.invoke.SwitchPoint;
   46.15  import java.lang.ref.ReferenceQueue;
   46.16  import java.lang.ref.SoftReference;
   46.17  import java.lang.reflect.Field;
   46.18 @@ -127,6 +127,16 @@
   46.19      private static MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
   46.20      private static MethodType CREATE_PROGRAM_FUNCTION_TYPE = MethodType.methodType(ScriptFunction.class, ScriptObject.class);
   46.21  
   46.22 +    /**
   46.23 +     * Keeps track of which builtin prototypes and properties have been relinked
   46.24 +     * Currently we are conservative and associate the name of a builtin class with all
   46.25 +     * its properties, so it's enough to invalidate a property to break all assumptions
   46.26 +     * about a prototype. This can be changed to a more fine grained approach, but no one
   46.27 +     * ever needs this, given the very rare occurance of swapping out only parts of
   46.28 +     * a builtin v.s. the entire builtin object
   46.29 +     */
   46.30 +    private final Map<String, SwitchPoint> builtinSwitchPoints = new HashMap<>();
   46.31 +
   46.32      /* Force DebuggerSupport to be loaded. */
   46.33      static {
   46.34          DebuggerSupport.FORCELOAD = true;
   46.35 @@ -1371,4 +1381,34 @@
   46.36          return null;
   46.37      }
   46.38  
   46.39 +    /**
   46.40 +     * This is a special kind of switchpoint used to guard builtin
   46.41 +     * properties and prototypes. In the future it might contain
   46.42 +     * logic to e.g. multiple switchpoint classes.
   46.43 +     */
   46.44 +    public static final class BuiltinSwitchPoint extends SwitchPoint {
   46.45 +        //empty
   46.46 +    }
   46.47 +
   46.48 +    /**
   46.49 +     * Create a new builtin switchpoint and return it
   46.50 +     * @param name key name
   46.51 +     * @return new builtin switchpoint
   46.52 +     */
   46.53 +    public SwitchPoint newBuiltinSwitchPoint(final String name) {
   46.54 +        assert builtinSwitchPoints.get(name) == null;
   46.55 +        final SwitchPoint sp = new BuiltinSwitchPoint();
   46.56 +        builtinSwitchPoints.put(name, sp);
   46.57 +        return sp;
   46.58 +    }
   46.59 +
   46.60 +    /**
   46.61 +     * Return the builtin switchpoint for a particular key name
   46.62 +     * @param name key name
   46.63 +     * @return builtin switchpoint or null if none
   46.64 +     */
   46.65 +    public SwitchPoint getBuiltinSwitchPoint(final String name) {
   46.66 +        return builtinSwitchPoints.get(name);
   46.67 +    }
   46.68 +
   46.69  }