hg: valhalla/valhalla: Merge

david.simms at oracle.com david.simms at oracle.com
Fri Dec 1 15:04:11 UTC 2017


Changeset: cc15652e1dc6
Author:    dsimms
Date:      2017-12-01 15:58 +0100
URL:       http://hg.openjdk.java.net/valhalla/valhalla/rev/cc15652e1dc6

Merge

! make/autoconf/generated-configure.sh
! make/common/Modules.gmk
- make/mapfiles/libextnet/mapfile-vers
- src/hotspot/.mx.jvmci/.project
- src/hotspot/.mx.jvmci/.pydevproject
! src/hotspot/cpu/aarch64/globals_aarch64.hpp
- src/hotspot/cpu/aarch64/jni_aarch64.h
- src/hotspot/cpu/arm/jni_arm.h
! src/hotspot/cpu/ppc/globals_ppc.hpp
- src/hotspot/cpu/ppc/jni_ppc.h
- src/hotspot/cpu/s390/jni_s390.h
! src/hotspot/cpu/sparc/globals_sparc.hpp
- src/hotspot/cpu/sparc/jni_sparc.h
! src/hotspot/cpu/x86/frame_x86.cpp
! src/hotspot/cpu/x86/globals_x86.hpp
! src/hotspot/cpu/x86/interp_masm_x86.cpp
! src/hotspot/cpu/x86/interp_masm_x86.hpp
- src/hotspot/cpu/x86/jni_x86.h
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/sharedRuntime_x86_64.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/cpu/x86/x86_64.ad
! src/hotspot/cpu/zero/globals_zero.hpp
- src/hotspot/cpu/zero/jni_zero.h
- src/hotspot/os/aix/jvm_aix.h
- src/hotspot/os/bsd/jvm_bsd.h
- src/hotspot/os/linux/jvm_linux.h
- src/hotspot/os/solaris/jvm_solaris.h
- src/hotspot/os/windows/jvm_windows.h
! src/hotspot/share/c1/c1_GraphBuilder.cpp
! src/hotspot/share/c1/c1_LinearScan.cpp
! src/hotspot/share/ci/ciEnv.cpp
! src/hotspot/share/ci/ciEnv.hpp
! src/hotspot/share/ci/ciInstanceKlass.cpp
! src/hotspot/share/ci/ciObjectFactory.cpp
! src/hotspot/share/ci/ciReplay.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/jimage.hpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/verifier.cpp
! src/hotspot/share/classfile/vmSymbols.cpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/code/codeBlob.cpp
! src/hotspot/share/code/codeBlob.hpp
! src/hotspot/share/code/compiledMethod.cpp
! src/hotspot/share/code/nmethod.cpp
! src/hotspot/share/code/scopeDesc.cpp
! src/hotspot/share/compiler/compileBroker.cpp
! src/hotspot/share/compiler/oopMap.cpp
- src/hotspot/share/gc/g1/concurrentG1Refine.cpp
- src/hotspot/share/gc/g1/concurrentG1Refine.hpp
- src/hotspot/share/gc/g1/concurrentG1RefineThread.cpp
- src/hotspot/share/gc/g1/concurrentG1RefineThread.hpp
- src/hotspot/share/gc/g1/g1MarkSweep.cpp
- src/hotspot/share/gc/g1/g1MarkSweep.hpp
- src/hotspot/share/gc/g1/g1MarkSweep_ext.cpp
- src/hotspot/share/gc/g1/g1RemSet.inline.hpp
- src/hotspot/share/gc/g1/g1SerialFullCollector.cpp
- src/hotspot/share/gc/g1/g1SerialFullCollector.hpp
! src/hotspot/share/gc/parallel/psParallelCompact.cpp
! src/hotspot/share/interpreter/bytecodeInterpreter.cpp
! src/hotspot/share/interpreter/interpreterRuntime.cpp
! src/hotspot/share/interpreter/interpreterRuntime.hpp
! src/hotspot/share/interpreter/linkResolver.cpp
! src/hotspot/share/interpreter/templateInterpreter.cpp
! src/hotspot/share/interpreter/templateInterpreter.hpp
! src/hotspot/share/interpreter/templateInterpreterGenerator.cpp
! src/hotspot/share/interpreter/templateInterpreterGenerator.hpp
! src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
! src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
! src/hotspot/share/jvmci/jvmciEnv.cpp
! src/hotspot/share/logging/logTag.hpp
! src/hotspot/share/memory/universe.cpp
! src/hotspot/share/memory/universe.inline.hpp
! src/hotspot/share/oops/constantPool.cpp
! src/hotspot/share/oops/cpCache.cpp
! src/hotspot/share/oops/generateOopMap.cpp
! src/hotspot/share/oops/instanceKlass.cpp
! src/hotspot/share/oops/klass.hpp
! src/hotspot/share/oops/klassVtable.cpp
! src/hotspot/share/oops/method.hpp
! src/hotspot/share/oops/objArrayKlass.cpp
! src/hotspot/share/oops/oop.cpp
! src/hotspot/share/oops/oop.hpp
! src/hotspot/share/oops/oop.inline.hpp
! src/hotspot/share/oops/valueKlass.cpp
! src/hotspot/share/opto/castnode.cpp
! src/hotspot/share/opto/cfgnode.cpp
! src/hotspot/share/opto/mulnode.cpp
! src/hotspot/share/opto/output.cpp
! src/hotspot/share/opto/parse1.cpp
! src/hotspot/share/opto/parse3.cpp
! src/hotspot/share/opto/phaseX.cpp
! src/hotspot/share/opto/split_if.cpp
! src/hotspot/share/opto/type.cpp
! src/hotspot/share/precompiled/precompiled.hpp
! src/hotspot/share/prims/jni.cpp
- src/hotspot/share/prims/jni_md.h
! src/hotspot/share/prims/jvm.cpp
- src/hotspot/share/prims/jvm.h
! src/hotspot/share/prims/jvmtiTagMap.cpp
! src/hotspot/share/prims/whitebox.cpp
! src/hotspot/share/runtime/arguments.cpp
! src/hotspot/share/runtime/deoptimization.cpp
! src/hotspot/share/runtime/deoptimization.hpp
! src/hotspot/share/runtime/frame.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/handles.cpp
! src/hotspot/share/runtime/interfaceSupport.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/stubRoutines.cpp
! src/hotspot/share/runtime/thread.cpp
! src/hotspot/share/runtime/thread.hpp
! src/hotspot/share/runtime/vmStructs.cpp
! src/hotspot/share/runtime/vm_operations.cpp
! src/hotspot/share/runtime/vm_operations.hpp
! src/hotspot/share/services/diagnosticCommand.cpp
! src/hotspot/share/utilities/accessFlags.hpp
! src/hotspot/share/utilities/constantTag.hpp
! src/hotspot/share/utilities/growableArray.hpp
- src/java.base/macosx/native/include/jni_md.h
- src/java.base/macosx/native/include/jvm_md.h
! src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.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/LambdaFormEditor.java
! src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
! src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java
- src/java.base/share/classes/jdk/internal/util/jar/VersionedStream.java
! src/java.base/share/classes/module-info.java
! src/java.base/share/classes/valhalla/shady/MinimalValueTypes_1_0.java
! src/java.base/share/native/include/classfile_constants.h
- src/java.desktop/share/classes/sun/java2d/pisces/Curve.java
- src/java.desktop/share/classes/sun/java2d/pisces/Dasher.java
- src/java.desktop/share/classes/sun/java2d/pisces/Helpers.java
- src/java.desktop/share/classes/sun/java2d/pisces/PiscesCache.java
- src/java.desktop/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java
- src/java.desktop/share/classes/sun/java2d/pisces/PiscesTileGenerator.java
- src/java.desktop/share/classes/sun/java2d/pisces/Renderer.java
- src/java.desktop/share/classes/sun/java2d/pisces/Stroker.java
- src/java.desktop/share/classes/sun/java2d/pisces/TransformingPathConsumer2D.java
- src/java.desktop/unix/classes/sun/java2d/jules/IdleTileCache.java
- src/java.desktop/unix/classes/sun/java2d/jules/JulesAATileGenerator.java
- src/java.desktop/unix/classes/sun/java2d/jules/JulesPathBuf.java
- src/java.desktop/unix/classes/sun/java2d/jules/JulesRenderingEngine.java
- src/java.desktop/unix/classes/sun/java2d/jules/JulesShapePipe.java
- src/java.desktop/unix/classes/sun/java2d/jules/JulesTile.java
- src/java.desktop/unix/classes/sun/java2d/jules/TileTrapContainer.java
- src/java.desktop/unix/classes/sun/java2d/jules/TileWorker.java
- src/java.desktop/unix/classes/sun/java2d/jules/TrapezoidList.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/MS950_HKSCS.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.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.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JNIid.java
- src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/overview.html
- src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/overview.html
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopySlowPathNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopyUnrollNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/UnsafeArrayCopyNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/UnsafeArrayCopySnippets.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/DivNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BasicIdealGraphPrinter.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/IdealGraphPrinter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableHeader.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/GroupTypes.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MethodTypes.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ModulePackageTypes.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/TableTabTypes.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
- src/jdk.jshell/share/classes/jdk/jshell/tool/resources/JAVASE.jsh
! test/hotspot/jtreg/ProblemList.txt
! test/hotspot/jtreg/TEST.groups
- test/hotspot/jtreg/applications/ctw/Modules.java
! test/jdk/TEST.groups
- test/jdk/java/lang/SecurityManager/NoAWT.java
- test/jdk/jdk/internal/util/jar/TestVersionedStream.java
- test/jdk/sun/java2d/pisces/OpenJDKFillBug.java
- test/jdk/sun/java2d/pisces/Renderer/Test7019861.java
- test/jdk/sun/java2d/pisces/Renderer/TestNPE.java
- test/jdk/sun/java2d/pisces/Test7036754.java
- test/jdk/sun/pisces/DashStrokeTest.java
- test/jdk/sun/pisces/JoinMiterTest.java
- test/jdk/sun/pisces/ScaleTest.java
- test/jdk/sun/pisces/StrokeShapeTest.java
- test/jdk/sun/pisces/TEST.properties
- test/jdk/sun/pisces/ThinLineTest.java
- test/langtools/tools/javac/doctree/dcapi/OverviewTest.java
- test/langtools/tools/javadoc/sourceOnly/p/NonSource.class
! test/lib/sun/hotspot/WhiteBox.java



More information about the valhalla-dev mailing list