hg: panama/dev: manual merge with default

henry.jen at oracle.com henry.jen at oracle.com
Thu Jul 19 19:05:47 UTC 2018


Changeset: beee7edaa2ca
Author:    henryjen
Date:      2018-07-19 11:39 -0700
URL:       http://hg.openjdk.java.net/panama/dev/rev/beee7edaa2ca

manual merge with default

! make/common/NativeCompilation.gmk
- make/data/symbols/java.base-6.sym.txt
- make/data/symbols/java.compiler-6.sym.txt
- make/data/symbols/java.desktop-6.sym.txt
- make/data/symbols/java.logging-6.sym.txt
- make/data/symbols/java.management-6.sym.txt
- make/data/symbols/java.rmi-6.sym.txt
- make/data/symbols/java.security.jgss-6.sym.txt
- make/data/symbols/java.sql-6.sym.txt
- make/data/symbols/java.sql.rowset-6.sym.txt
- make/data/symbols/java.xml-6.sym.txt
- make/data/symbols/java.xml.bind-6.sym.txt
- make/data/symbols/java.xml.ws-6.sym.txt
- make/data/symbols/java.xml.ws.annotation-6.sym.txt
- make/data/symbols/jdk.management-6.sym.txt
- make/data/symbols/jdk.sctp-6.sym.txt
- make/data/symbols/jdk.security.jgss-6.sym.txt
! src/hotspot/cpu/x86/x86.ad
! src/hotspot/share/adlc/formssel.cpp
! src/hotspot/share/opto/callnode.cpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/lcm.cpp
! src/hotspot/share/opto/macro.cpp
! src/hotspot/share/opto/node.hpp
! src/hotspot/share/opto/output.cpp
! src/hotspot/share/opto/runtime.cpp
! src/hotspot/share/opto/type.cpp
! src/hotspot/share/runtime/deoptimization.cpp
- test/hotspot/jtreg/runtime/appcds/MismatchedUseAppCDS.java
- test/hotspot/jtreg/runtime/appcds/test-classes/CheckIfShared.java
- test/langtools/tools/javac/TryWithResources/WeirdTwr.out
- test/langtools/tools/javac/diags/examples/MethodInvokedWithWrongNumberOfArgs.java
- test/langtools/tools/javac/diags/examples/MulticatchNotSupported.java
- test/langtools/tools/javac/diags/examples/StringSwitchNotSupported.java
- test/langtools/tools/javac/diags/examples/TryResourceNotSupported.java
- test/langtools/tools/javac/diags/examples/TryWithoutCatchOrFinally.java
- test/langtools/tools/javac/diags/examples/UnsupportedBinaryLiteral.java
- test/langtools/tools/javac/diags/examples/UnsupportedUnderscoreLiteral.java
- test/langtools/tools/javac/warnings/6594914/T6594914b.out



More information about the panama-dev mailing list