hg: amber/amber: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Thu Aug 23 20:03:58 UTC 2018


Changeset: 5a41b55194c6
Author:    mcimadamore
Date:      2018-08-23 22:06 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/5a41b55194c6

Automatic merge with default

- src/hotspot/share/gc/g1/ptrQueue.cpp
- src/hotspot/share/gc/g1/ptrQueue.hpp
- src/hotspot/share/gc/g1/satbMarkQueue.cpp
- src/hotspot/share/gc/g1/satbMarkQueue.hpp
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64InstructionAttr.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64VectorAssembler.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/IntrinsificationPredicate.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/NotOnDebug.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorLIRInstruction.java
- test/hotspot/jtreg/runtime/appcds/cacheObject/RangeNotWithinHeap.java
- test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libfreebl3.dylib
- test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libnspr4.dylib
- test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libnss3.dylib
- test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssckbi.dylib
- test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssdbm3.dylib
- test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssutil3.dylib
- test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libplc4.dylib
- test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libplds4.dylib
- test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libsoftokn3.dylib
- test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libsqlite3.dylib
- test/jdk/sun/security/pkcs11/nss/lib/macosx-x86_64/libssl3.dylib
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nspr4.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nspr4.lib
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/plc4.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/plc4.lib
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/plds4.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/plds4.lib
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nspr4.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nspr4.lib
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/plc4.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/plc4.lib
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/plds4.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/plds4.lib
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll
- test/jdk/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib



More information about the amber-dev mailing list