hg: amber/amber: manual merge with condy

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Mon Oct 16 13:45:58 UTC 2017


Changeset: b846aa5f933d
Author:    mcimadamore
Date:      2017-10-16 14:42 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/b846aa5f933d

manual merge with condy

- src/java.base/share/classes/java/lang/invoke/Bootstraps.java
- src/java.base/share/classes/java/lang/invoke/ConstantDynamic.java
! src/java.base/share/classes/java/lang/invoke/ConstantRef.java
! src/java.base/share/classes/java/lang/invoke/DynamicConstantRef.java
! src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
! test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/InstructionHelper.java
! test/jdk/lib/testlibrary/bytecode/jdk/experimental/bytecode/BytePoolHelper.java
! test/jdk/lib/testlibrary/bytecode/jdk/experimental/bytecode/CodeBuilder.java
! test/jdk/lib/testlibrary/bytecode/jdk/experimental/bytecode/IsolatedMethodBuilder.java
! test/jdk/lib/testlibrary/bytecode/jdk/experimental/bytecode/PoolHelper.java
! test/jdk/lib/testlibrary/bytecode/jdk/experimental/bytecode/TypedCodeBuilder.java



More information about the amber-dev mailing list