hg: valhalla/valhalla: Merge

david.holmes at oracle.com david.holmes at oracle.com
Mon Jun 4 04:44:55 UTC 2018


Changeset: 856c2c87fdf2
Author:    dholmes
Date:      2018-06-04 00:44 -0400
URL:       http://hg.openjdk.java.net/valhalla/valhalla/rev/856c2c87fdf2

Merge

- make/BuildNashorn.gmk
- make/UnpackSecurity.gmk
! src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
! src/hotspot/cpu/arm/templateTable_arm.cpp
! src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
! src/hotspot/cpu/s390/templateTable_s390.cpp
! src/hotspot/cpu/x86/templateTable_x86.cpp
- src/hotspot/os/aix/jvm_aix.cpp
- src/hotspot/os/bsd/jvm_bsd.cpp
- src/hotspot/os/linux/jvm_linux.cpp
- src/hotspot/os/solaris/jvm_solaris.cpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/logging/logTag.hpp
- src/hotspot/share/memory/metachunk.cpp
- src/hotspot/share/memory/metachunk.hpp
! src/hotspot/share/oops/arrayKlass.cpp
! src/hotspot/share/oops/instanceKlass.cpp
! src/hotspot/share/oops/instanceKlass.hpp
! src/hotspot/share/oops/klass.cpp
! src/hotspot/share/oops/klass.hpp
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/runtime/reflection.cpp
- src/hotspot/share/runtime/vmStructs_trace.hpp
- src/hotspot/share/trace/noTraceBackend.hpp
- src/hotspot/share/trace/trace.dtd
- src/hotspot/share/trace/trace.xml
- src/hotspot/share/trace/traceBackend.cpp
- src/hotspot/share/trace/traceBackend.hpp
- src/hotspot/share/trace/traceDataTypes.hpp
- src/hotspot/share/trace/traceEvent.hpp
- src/hotspot/share/trace/traceEventClasses.xsl
- src/hotspot/share/trace/traceEventIds.xsl
- src/hotspot/share/trace/traceMacros.hpp
- src/hotspot/share/trace/traceStream.cpp
- src/hotspot/share/trace/traceStream.hpp
- src/hotspot/share/trace/traceTime.hpp
- src/hotspot/share/trace/traceTypes.xsl
- src/hotspot/share/trace/traceevents.xml
- src/hotspot/share/trace/tracerelationdecls.xml
- src/hotspot/share/trace/tracetypes.xml
- src/hotspot/share/trace/tracing.hpp
- src/hotspot/share/trace/tracingExport.cpp
- src/hotspot/share/trace/tracingExport.hpp
- src/hotspot/share/trace/xinclude.mod
- src/hotspot/share/trace/xsl_util.xsl
- src/hotspot/share/utilities/ticks.inline.hpp
- src/java.base/macosx/conf/x86_64/jvm.cfg
! src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
! src/java.base/share/classes/java/lang/reflect/Method.java
- src/java.base/unix/conf/aarch64/jvm.cfg
- src/java.base/unix/conf/amd64/jvm.cfg
- src/java.base/unix/conf/arm/jvm.cfg
- src/java.base/unix/conf/i586/jvm.cfg
- src/java.base/unix/conf/ia64/jvm.cfg
- src/java.base/unix/conf/ppc64/jvm.cfg
- src/java.base/unix/conf/ppc64le/jvm.cfg
- src/java.base/unix/conf/s390x/jvm.cfg
- src/java.base/unix/conf/sparc/jvm.cfg
- src/java.base/unix/conf/sparcv9/jvm.cfg
- src/java.base/unix/conf/zero/jvm.cfg
- src/java.base/windows/conf/amd64/jvm.cfg
- src/java.base/windows/conf/i586/jvm.cfg
- src/java.base/windows/conf/ia64/jvm.cfg
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseExecutableMemberTaglet.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseInlineTaglet.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/HiddenTaglet.java
! test/hotspot/jtreg/ProblemList.txt
+ test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/BasicTest.java
+ test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/PrivateMethodsTest.java
! test/jdk/ProblemList.txt
- test/jdk/java/lang/Character/Blocks.txt
- test/jdk/java/lang/Character/CheckBlocks.java
- test/jdk/java/lang/Character/TestISOControls.java



More information about the valhalla-dev mailing list