hg: valhalla/valhalla/hotspot: Merge

[david.holmes at oracle.com]

Changeset: 2dfe246179c0
Author:    dholmes
Date:      2017-09-20 23:55 -0400
URL:       http://hg.openjdk.java.net/valhalla/valhalla/hotspot/rev/2dfe246179c0

Merge

! src/cpu/aarch64/vm/globals_aarch64.hpp
! src/cpu/x86/vm/globals_x86.hpp
! src/cpu/x86/vm/interp_masm_x86.cpp
- src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MiscUtils.java
- src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/utils/Timer.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/LoaderConstraintEntry.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/LoaderConstraintTable.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/PlaceholderEntry.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/PlaceholderTable.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/ProtectionDomainCacheEntry.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/ProtectionDomainEntry.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/TwoOopHashtable.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/micro/benchmarks/ArrayDuplicationBenchmark.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/micro/benchmarks/ArrayListBenchmark.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/micro/benchmarks/BoxingBenchmark.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/micro/benchmarks/ConcurrentSkipListBenchmark.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/micro/benchmarks/GuardedIntrinsicBenchmark.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/micro/benchmarks/HashBenchmark.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/micro/benchmarks/MathFunctionBenchmark.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/micro/benchmarks/SimpleSyncBenchmark.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/micro/benchmarks/package-info.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/TestJMH.java
- src/os_cpu/solaris_x86/vm/solaris_x86_32.il
- src/os_cpu/solaris_x86/vm/solaris_x86_32.s
! src/share/vm/classfile/classFileParser.cpp
! src/share/vm/classfile/javaClasses.cpp
! src/share/vm/classfile/systemDictionary.cpp
! src/share/vm/classfile/systemDictionary.hpp
! src/share/vm/classfile/vmSymbols.cpp
! src/share/vm/classfile/vmSymbols.hpp
- src/share/vm/gc/g1/workerDataArray.cpp
- src/share/vm/gc/g1/workerDataArray.hpp
- src/share/vm/gc/g1/workerDataArray.inline.hpp
! src/share/vm/gc/parallel/psParallelCompact.cpp
! src/share/vm/gc/serial/markSweep.cpp
! src/share/vm/interpreter/interpreterRuntime.cpp
! src/share/vm/interpreter/linkResolver.cpp
! src/share/vm/interpreter/rewriter.cpp
! src/share/vm/jvmci/jvmciCompilerToVM.cpp
! src/share/vm/logging/logTag.hpp
! src/share/vm/oops/arrayKlass.cpp
! src/share/vm/oops/arrayKlass.hpp
! src/share/vm/oops/constantPool.cpp
! src/share/vm/oops/cpCache.cpp
! src/share/vm/oops/cpCache.hpp
! src/share/vm/oops/instanceKlass.cpp
! src/share/vm/oops/instanceKlass.hpp
! src/share/vm/oops/klass.hpp
! src/share/vm/oops/klassVtable.cpp
! src/share/vm/oops/klassVtable.hpp
! src/share/vm/oops/method.cpp
! src/share/vm/oops/methodData.cpp
! src/share/vm/oops/objArrayKlass.cpp
! src/share/vm/oops/oop.cpp
! src/share/vm/oops/oop.hpp
! src/share/vm/oops/oop.inline.hpp
! src/share/vm/oops/oopsHierarchy.hpp
! src/share/vm/opto/classes.hpp
! src/share/vm/opto/compile.cpp
! src/share/vm/opto/library_call.cpp
! src/share/vm/opto/macroArrayCopy.cpp
! src/share/vm/opto/memnode.cpp
! src/share/vm/opto/runtime.cpp
! src/share/vm/precompiled/precompiled.hpp
! src/share/vm/prims/jni.cpp
! src/share/vm/prims/jvm.cpp
! src/share/vm/prims/whitebox.cpp
! src/share/vm/runtime/arguments.cpp
! src/share/vm/runtime/deoptimization.cpp
! src/share/vm/runtime/globals.hpp
! src/share/vm/runtime/handles.hpp
! src/share/vm/runtime/javaCalls.cpp
! src/share/vm/runtime/reflection.cpp
! src/share/vm/runtime/sharedRuntime.cpp
! src/share/vm/utilities/globalDefinitions.hpp
- test/native/gc/g1/test_workerDataArray.cpp
! test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java
- test/runtime/SharedArchiveFile/LargeSharedSpace.java
- test/runtime/SharedArchiveFile/LimitSharedSizes.java