hg: panama/dev: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Wed Jun 6 20:06:16 UTC 2018


Changeset: 167197c36ddf
Author:    mcimadamore
Date:      2018-06-06 22:10 +0200
URL:       http://hg.openjdk.java.net/panama/dev/rev/167197c36ddf

Automatic merge with default

! make/CompileJavaModules.gmk
! src/hotspot/cpu/sparc/methodHandles_sparc.cpp
! src/hotspot/cpu/x86/methodHandles_x86.cpp
- src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.inline.hpp
- src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.inline.hpp
- src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.inline.hpp
- src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.inline.hpp
- src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.inline.hpp
- src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.inline.hpp
- src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.inline.hpp
- src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.inline.hpp
- src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.inline.hpp
- src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.inline.hpp
- src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.inline.hpp
- src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.inline.hpp
- src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.inline.hpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/javaClasses.hpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/code/codeCache.hpp
! src/hotspot/share/logging/logTag.hpp
! src/hotspot/share/oops/method.cpp
! src/hotspot/share/opto/library_call.cpp
! src/hotspot/share/prims/unsafe.cpp
! src/hotspot/share/runtime/globals.hpp
- src/hotspot/share/runtime/orderAccess.inline.hpp
! src/hotspot/share/runtime/sharedRuntime.hpp
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
- src/java.desktop/linux/conf/oblique-fonts/fonts.dir
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cbdt-table.hh
- src/java.desktop/unix/conf/fonts/fonts.dir
- src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MissingRequiredOptionException.java
- src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnacceptableNumberOfNonOptionsException.java
- src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Objects.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugValueMap.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/aaa
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/META-INF/services/javax.annotation.processing.Processor
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/APHotSpotSignature.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/AbstractVerifier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/ClassSubstitutionVerifier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/FoldVerifier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedFoldPlugin.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedNodeIntrinsicPlugin.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedPlugin.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/InjectedDependencies.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/MethodSubstitutionVerifier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/NodeIntrinsicVerifier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/PluginGenerator.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/VerifierAnnotationProcessor.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/D
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-1.10.2.js
- test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsHelper.java
- test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsTests.java
- test/hotspot/jtreg/runtime/appcds/test-classes/jdk/dynalink/DynamicLinker.jasm
- test/jdk/javax/sound/midi/MidiSystem/DefaultProperties.java
- test/jdk/javax/sound/midi/MidiSystem/testdata/conf/sound.properties
- test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties.java
- test/jdk/javax/sound/sampled/AudioSystem/testdata/conf/sound.properties



More information about the panama-dev mailing list