Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java	Tue Oct 07 10:57:55 2014 -0700
     1.2 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java	Wed Oct 08 11:28:13 2014 +0200
     1.3 @@ -86,6 +86,7 @@
     1.4  import jdk.internal.org.objectweb.asm.Handle;
     1.5  import jdk.internal.org.objectweb.asm.MethodVisitor;
     1.6  import jdk.internal.org.objectweb.asm.Type;
     1.7 +import jdk.nashorn.internal.objects.annotations.SpecializedFunction.LinkLogic;
     1.8  
     1.9  /**
    1.10   * Base class for all method generating classes.
    1.11 @@ -98,7 +99,7 @@
    1.12      private final Type returnType;
    1.13      private final Type[] argumentTypes;
    1.14  
    1.15 -    static final Type EMPTY_LINK_LOGIC_TYPE = Type.getType("Ljdk/nashorn/internal/objects/annotations/SpecializedFunction$LinkLogic$Empty;");
    1.16 +    static final Type EMPTY_LINK_LOGIC_TYPE = Type.getType(LinkLogic.getEmptyLinkLogicClass());
    1.17  
    1.18      MethodGenerator(final MethodVisitor mv, final int access, final String name, final String descriptor) {
    1.19          super(ASM4, mv);

     2.1 --- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java	Tue Oct 07 10:57:55 2014 -0700
     2.2 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java	Wed Oct 08 11:28:13 2014 +0200
     2.3 @@ -38,6 +38,7 @@
     2.4  import jdk.nashorn.internal.objects.annotations.ScriptClass;
     2.5  import jdk.nashorn.internal.objects.annotations.Setter;
     2.6  import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
     2.7 +import jdk.nashorn.internal.objects.annotations.SpecializedFunction.LinkLogic;
     2.8  import jdk.nashorn.internal.objects.annotations.Where;
     2.9  import jdk.nashorn.internal.tools.nasgen.MemberInfo.Kind;
    2.10  
    2.11 @@ -55,8 +56,8 @@
    2.12      static final String SETTER_ANNO_DESC        = Type.getDescriptor(Setter.class);
    2.13      static final String PROPERTY_ANNO_DESC      = Type.getDescriptor(Property.class);
    2.14      static final String WHERE_ENUM_DESC         = Type.getDescriptor(Where.class);
    2.15 +    static final String LINK_LOGIC_DESC         = Type.getDescriptor(LinkLogic.class);
    2.16      static final String SPECIALIZED_FUNCTION    = Type.getDescriptor(SpecializedFunction.class);
    2.17 -    static final String LINK_LOGIC_DESC         = "Ljdk/nashorn/internal/objects/annotations/SpecializedFunction$LinkLogic;";
    2.18  
    2.19      static final Map<String, Kind> annotations = new HashMap<>();
    2.20  

     3.1 --- a/make/BuildNashorn.gmk	Tue Oct 07 10:57:55 2014 -0700
     3.2 +++ b/make/BuildNashorn.gmk	Wed Oct 08 11:28:13 2014 +0200
     3.3 @@ -65,7 +65,7 @@
     3.4      SETUP := GENERATE_NEWBYTECODE_DEBUG, \
     3.5      SRC := $(NASGEN_SRC) $(ASM_SRC), \
     3.6      BIN := $(NASHORN_OUTPUTDIR)/nasgen_classes, \
     3.7 -    ADD_JAVAC_FLAGS := -cp $(NASHORN_OUTPUTDIR)/nashorn_classes))
     3.8 +    ADD_JAVAC_FLAGS := -bootclasspath "$(BOOT_RTJAR)$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes"))
     3.9  
    3.10  # Nasgen needs nashorn classes
    3.11  $(BUILD_NASGEN): $(BUILD_NASHORN)