hg: amber/amber: manual merge

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Wed Dec 6 11:56:45 UTC 2017


Changeset: 1bf9afefd598
Author:    mcimadamore
Date:      2017-12-06 11:52 +0000
URL:       http://hg.openjdk.java.net/amber/amber/rev/1bf9afefd598

manual merge

! make/CompileJavaModules.gmk
! make/InitSupport.gmk
! make/RunTests.gmk
! make/autoconf/basics.m4
! make/autoconf/boot-jdk.m4
! make/autoconf/generated-configure.sh
! make/autoconf/spec.gmk.in
! make/autoconf/toolchain.m4
! src/java.base/share/classes/java/lang/Class.java
! src/java.base/share/classes/java/lang/String.java
- src/java.base/share/classes/jdk/internal/util/jar/VersionedStream.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- test/jdk/jdk/internal/misc/JavaLangAccess/NewUnsafeString.java
- test/langtools/tools/javac/6302184/T6302184.java
- test/langtools/tools/javac/6302184/T6302184.out
! test/langtools/tools/javac/diags/examples.not-yet.txt



More information about the amber-dev mailing list