hg: valhalla/valhalla: Merge

tobias.hartmann at oracle.com tobias.hartmann at oracle.com
Mon Jun 11 14:22:16 UTC 2018


Changeset: b506159453c0
Author:    thartmann
Date:      2018-06-11 16:19 +0200
URL:       http://hg.openjdk.java.net/valhalla/valhalla/rev/b506159453c0

Merge

- make/BuildNashorn.gmk
! make/CompileJavaModules.gmk
+ make/CompileJavaModulesNashorn.gmk
! make/Docs.gmk
- make/UnpackSecurity.gmk
! make/common/Modules.gmk
! make/conf/jib-profiles.js
! src/hotspot/cpu/x86/interp_masm_x86.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.hpp
! src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
! src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
! src/hotspot/cpu/x86/templateTable_x86.cpp
! src/hotspot/cpu/x86/x86_64.ad
- 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/c1/c1_GraphBuilder.cpp
! src/hotspot/share/ci/ciEnv.cpp
! src/hotspot/share/ci/ciMethod.cpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/classLoader.cpp
! src/hotspot/share/classfile/classLoaderData.cpp
! src/hotspot/share/classfile/classLoaderData.hpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/vmSymbols.cpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/compiler/compileBroker.cpp
! src/hotspot/share/gc/parallel/psCompactionManager.cpp
! src/hotspot/share/gc/parallel/psParallelCompact.cpp
! src/hotspot/share/gc/parallel/psPromotionManager.cpp
! src/hotspot/share/interpreter/interpreterRuntime.cpp
! src/hotspot/share/interpreter/interpreterRuntime.hpp
! src/hotspot/share/interpreter/templateInterpreterGenerator.cpp
! src/hotspot/share/interpreter/templateInterpreterGenerator.hpp
! src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
! src/hotspot/share/logging/logTag.hpp
! src/hotspot/share/memory/iterator.hpp
- src/hotspot/share/memory/metachunk.cpp
- src/hotspot/share/memory/metachunk.hpp
! src/hotspot/share/memory/vtBuffer.cpp
! 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/oops/method.hpp
! src/hotspot/share/oops/objArrayKlass.cpp
! src/hotspot/share/oops/oop.hpp
! src/hotspot/share/oops/oop.inline.hpp
! src/hotspot/share/oops/typeArrayKlass.cpp
! src/hotspot/share/opto/arraycopynode.cpp
! src/hotspot/share/opto/callnode.cpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/compile.hpp
! src/hotspot/share/opto/escape.cpp
! src/hotspot/share/opto/graphKit.cpp
! src/hotspot/share/opto/graphKit.hpp
! src/hotspot/share/opto/library_call.cpp
! src/hotspot/share/opto/loopopts.cpp
! src/hotspot/share/opto/macro.cpp
! src/hotspot/share/opto/macro.hpp
! src/hotspot/share/opto/macroArrayCopy.cpp
! src/hotspot/share/opto/node.cpp
! src/hotspot/share/opto/parse.hpp
! src/hotspot/share/opto/parse2.cpp
! src/hotspot/share/opto/parse3.cpp
! src/hotspot/share/opto/parseHelper.cpp
! src/hotspot/share/opto/phaseX.cpp
! src/hotspot/share/opto/runtime.cpp
! src/hotspot/share/opto/runtime.hpp
! src/hotspot/share/opto/valuetypenode.cpp
! src/hotspot/share/prims/jni.cpp
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/prims/jvmtiTagMap.cpp
! src/hotspot/share/prims/whitebox.cpp
! src/hotspot/share/runtime/arguments.cpp
! src/hotspot/share/runtime/biasedLocking.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/javaCalls.cpp
! src/hotspot/share/runtime/jniHandles.cpp
! src/hotspot/share/runtime/mutexLocker.cpp
! src/hotspot/share/runtime/reflection.cpp
! src/hotspot/share/runtime/safepoint.cpp
! src/hotspot/share/runtime/sharedRuntime.cpp
! src/hotspot/share/runtime/synchronizer.cpp
! src/hotspot/share/runtime/thread.cpp
! src/hotspot/share/runtime/thread.hpp
! src/hotspot/share/runtime/vmStructs.cpp
- src/hotspot/share/runtime/vmStructs_trace.hpp
! src/hotspot/share/runtime/vm_operations.cpp
- 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/globalDefinitions.hpp
- 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/Constructor.java
! src/java.base/share/classes/java/lang/reflect/Field.java
! src/java.base/share/classes/module-info.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/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/Lower.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.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/ClassWriter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.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
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
! test/hotspot/jtreg/ProblemList.txt
! test/hotspot/jtreg/TEST.groups
! test/jdk/TEST.groups
- test/jdk/java/lang/Character/Blocks.txt
- test/jdk/java/lang/Character/CheckBlocks.java
- test/jdk/java/lang/Character/TestISOControls.java
! test/langtools/tools/javac/diags/examples.not-yet.txt



More information about the valhalla-dev mailing list