hg: amber/amber/hotspot: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Thu Sep 7 22:03:51 UTC 2017


Changeset: b8fb8324627f
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-09-08 00:00 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/b8fb8324627f

Automatic merge with default

- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64RawNativeCallNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64RawNativeCallNode.java
! src/share/vm/classfile/systemDictionary.cpp
! src/share/vm/classfile/systemDictionary.hpp
! src/share/vm/interpreter/rewriter.cpp
! src/share/vm/memory/universe.cpp
! src/share/vm/oops/constantPool.cpp
- src/share/vm/runtime/fprofiler.cpp
- src/share/vm/runtime/fprofiler.hpp
! src/share/vm/runtime/globals.hpp
! src/share/vm/runtime/vmStructs.cpp
! src/share/vm/utilities/exceptions.cpp
- test/runtime/MinimalVM/Xprof.java



More information about the amber-dev mailing list