hg: valhalla/valhalla: Merge
david.simms at oracle.com
david.simms at oracle.com
Wed Mar 28 13:10:36 UTC 2018
Changeset: 76b3740cff03
Author: dsimms
Date: 2018-03-28 15:10 +0200
URL: http://hg.openjdk.java.net/valhalla/valhalla/rev/76b3740cff03
Merge
! make/CompileJavaModules.gmk
! make/Docs.gmk
! make/Images.gmk
! make/common/Modules.gmk
! make/conf/jib-profiles.js
- make/data/x11wrappergen/functions.txt
- make/data/x11wrappergen/sizes.32
- make/data/x11wrappergen/sizes.64
- make/data/x11wrappergen/sizes.64-solaris-i386
- make/devkit/createSolarisDevkit.sh
- make/hotspot/src/native/dtrace/generateJvmOffsetsMain.c
- make/lib/LibosxLibraries.gmk
- make/lib/NetworkingLibraries.gmk
- make/lib/NioLibraries.gmk
- make/lib/PlatformLibraries.gmk
- make/lib/SecurityLibraries.gmk
! src/hotspot/cpu/x86/globals_x86.hpp
! src/hotspot/cpu/x86/interp_masm_x86.cpp
! src/hotspot/cpu/x86/interpreterRT_x86_64.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.hpp
! src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
! src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
! src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
! src/hotspot/cpu/x86/templateTable_x86.cpp
! src/hotspot/share/c1/c1_GraphBuilder.cpp
! src/hotspot/share/ci/ciEnv.cpp
! src/hotspot/share/ci/ciInstanceKlass.cpp
! src/hotspot/share/ci/ciObject.hpp
! 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/verifier.cpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/code/compiledMethod.cpp
! src/hotspot/share/code/nmethod.cpp
- src/hotspot/share/gc/parallel/cardTableExtension.cpp
- src/hotspot/share/gc/parallel/cardTableExtension.hpp
! src/hotspot/share/gc/parallel/psCompactionManager.cpp
! src/hotspot/share/gc/parallel/psParallelCompact.cpp
! src/hotspot/share/gc/parallel/psPromotionManager.cpp
- src/hotspot/share/gc/shared/cardTableModRefBSForCTRS.cpp
! src/hotspot/share/include/jvm.h
! src/hotspot/share/interpreter/bytecodeInterpreter.cpp
! src/hotspot/share/interpreter/interpreterRuntime.cpp
! src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
! src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
! src/hotspot/share/jvmci/vmStructs_jvmci.cpp
! src/hotspot/share/logging/logTag.hpp
- src/hotspot/share/logging/logTagLevelExpression.cpp
- src/hotspot/share/logging/logTagLevelExpression.hpp
! src/hotspot/share/memory/allocation.inline.hpp
! src/hotspot/share/memory/oopFactory.cpp
! src/hotspot/share/memory/universe.cpp
! src/hotspot/share/memory/universe.inline.hpp
- src/hotspot/share/memory/universe_ext.cpp
! src/hotspot/share/oops/arrayOop.hpp
! src/hotspot/share/oops/constantPool.cpp
! src/hotspot/share/oops/constantPool.hpp
! src/hotspot/share/oops/generateOopMap.cpp
! src/hotspot/share/oops/instanceKlass.cpp
! src/hotspot/share/oops/instanceKlass.hpp
! src/hotspot/share/oops/instanceKlass.inline.hpp
! src/hotspot/share/oops/klass.cpp
! src/hotspot/share/oops/klass.hpp
! src/hotspot/share/oops/oop.hpp
! src/hotspot/share/oops/oop.inline.hpp
! src/hotspot/share/oops/oopsHierarchy.hpp
! src/hotspot/share/oops/typeArrayOop.hpp
! src/hotspot/share/oops/valueArrayKlass.cpp
! src/hotspot/share/oops/valueArrayKlass.inline.hpp
! src/hotspot/share/oops/valueArrayOop.cpp
! src/hotspot/share/oops/valueArrayOop.hpp
+ src/hotspot/share/oops/valueArrayOop.inline.hpp
! src/hotspot/share/opto/buildOopMap.cpp
! src/hotspot/share/opto/callnode.cpp
! src/hotspot/share/opto/compile.cpp
! 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/output.cpp
! src/hotspot/share/opto/parse2.cpp
! src/hotspot/share/opto/parseHelper.cpp
! src/hotspot/share/opto/runtime.cpp
! src/hotspot/share/opto/runtime.hpp
! src/hotspot/share/opto/split_if.cpp
! src/hotspot/share/prims/jni.cpp
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/prims/jvmtiRedefineClasses.cpp
! src/hotspot/share/prims/jvmtiTagMap.cpp
! src/hotspot/share/prims/methodHandles.cpp
! src/hotspot/share/prims/whitebox.cpp
! src/hotspot/share/runtime/arguments.cpp
! src/hotspot/share/runtime/deoptimization.cpp
! src/hotspot/share/runtime/fieldDescriptor.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/handles.cpp
! 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/sharedRuntime.hpp
! src/hotspot/share/runtime/stubRoutines.cpp
! src/hotspot/share/runtime/thread.cpp
! src/hotspot/share/runtime/thread.hpp
! src/hotspot/share/runtime/vmStructs.cpp
- src/hotspot/share/services/allocationContextService.hpp
! src/hotspot/share/services/diagnosticCommand.cpp
! src/hotspot/share/services/diagnosticCommand.hpp
! src/hotspot/share/utilities/globalDefinitions.cpp
! src/hotspot/share/utilities/globalDefinitions.hpp
! src/java.base/share/classes/java/lang/System.java
! src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java
! src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
! src/java.base/share/classes/java/lang/invoke/LambdaForm.java
! src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
! src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
- src/java.base/share/classes/javax/security/auth/Policy.java
! src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java
! src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java
- src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java
! src/java.base/share/native/libjava/System.c
- src/java.base/unix/classes/java/io/FileDescriptor.java
- src/java.base/windows/classes/java/io/FileDescriptor.java
- src/java.management/share/classes/sun/management/TypeVersionMapper.java
- src/java.sql/share/classes/javax/transaction/xa/XAException.java
- src/java.sql/share/classes/javax/transaction/xa/XAResource.java
- src/java.sql/share/classes/javax/transaction/xa/Xid.java
- src/java.sql/share/classes/javax/transaction/xa/package.html
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc.test/src/org/graalvm/compiler/core/sparc/test/SPARCAllocatorTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ArrayRangeWriteNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphSnippets.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.util.test/src/org/graalvm/util/test/CollectionTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/EconomicMap.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/EconomicSet.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/Equivalence.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/MapCursor.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/Pair.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/UnmodifiableEconomicMap.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/UnmodifiableEconomicSet.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/UnmodifiableMapCursor.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/impl/EconomicMapImpl.java
- test/hotspot/gtest/logging/test_logTagLevelExpression.cpp
! test/hotspot/jtreg/ProblemList.txt
! test/hotspot/jtreg/TEST.groups
! test/jdk/TEST.groups
- test/jdk/com/sun/jdi/JDIScaffold.java
- test/jdk/java/lang/System/ExitFinalizersAndJIT.java
- test/jdk/java/lang/System/finalization/FinExit.java
- test/jdk/java/lang/System/finalization/FinExit.sh
! test/jdk/java/lang/invoke/condy/CondyRepeatFailedResolution.java
! test/jdk/java/lang/invoke/condy/CondyReturnPrimitiveTest.java
! test/jdk/java/lang/invoke/condy/CondyWrongType.java
! test/jdk/java/lang/invoke/condy/ConstantBootstrapsTest.java
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-amd64/libLauncher.so
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so
- test/jdk/javax/transaction/testng/Driver.java
- test/jdk/javax/transaction/testng/test/transaction/XAExceptionTests.java
- test/jdk/javax/transaction/testng/util/SerializedTransactionExceptions.java
- test/jdk/sanity/releaseFile/NegativeSOURCETest.java
- test/jdk/sun/java2d/OpenGL/CopyAreaOOB.java
- test/jdk/sun/java2d/OpenGL/CustomCompositeTest.java
- test/jdk/sun/java2d/OpenGL/DrawBufImgOp.java
- test/jdk/sun/java2d/OpenGL/DrawHugeImageTest.java
- test/jdk/sun/java2d/OpenGL/GradientPaints.java
- test/jdk/sun/java2d/OpenGL/bug7181438.java
- test/jdk/sun/security/tools/jarsigner/warnings/bad_netscape_cert_type.jks.base64
- test/jdk/sun/security/tools/jarsigner/warnings/bad_netscape_cert_type.sh
! test/lib/sun/hotspot/WhiteBox.java
More information about the valhalla-dev
mailing list