--- old/src/hotspot/share/adlc/output_c.cpp 2020-05-06 16:17:36.779754794 -0700 +++ new/src/hotspot/share/adlc/output_c.cpp 2020-05-06 16:17:36.447748428 -0700 @@ -723,9 +723,7 @@ if (!_pipeline) /* Do Nothing */; - else if (_pipeline->_maxcycleused <= - 32 - ) { + else if (_pipeline->_maxcycleused <= 32) { fprintf(fp_cpp, "Pipeline_Use_Cycle_Mask operator&(const Pipeline_Use_Cycle_Mask &in1, const Pipeline_Use_Cycle_Mask &in2) {\n"); fprintf(fp_cpp, " return Pipeline_Use_Cycle_Mask(in1._mask & in2._mask);\n"); fprintf(fp_cpp, "}\n\n"); --- old/src/hotspot/share/adlc/output_h.cpp 2020-05-06 16:17:37.931776881 -0700 +++ new/src/hotspot/share/adlc/output_h.cpp 2020-05-06 16:17:37.543769442 -0700 @@ -741,9 +741,7 @@ fprintf(fp_hpp, "// Pipeline_Use_Cycle_Mask Class\n"); fprintf(fp_hpp, "class Pipeline_Use_Cycle_Mask {\n"); - if (_pipeline->_maxcycleused <= - 32 - ) { + if (_pipeline->_maxcycleused <= 32) { fprintf(fp_hpp, "protected:\n"); fprintf(fp_hpp, " %s _mask;\n\n", _pipeline->_maxcycleused <= 32 ? "uint" : "uint64_t" ); fprintf(fp_hpp, "public:\n"); --- old/src/hotspot/share/c1/c1_LIR.cpp 2020-05-06 16:17:38.943796284 -0700 +++ new/src/hotspot/share/c1/c1_LIR.cpp 2020-05-06 16:17:38.611789918 -0700 @@ -455,8 +455,6 @@ case lir_monaddr: // input and result always valid, info always invalid case lir_null_check: // input and info always valid, result always invalid case lir_move: // input and result always valid, may have info - case lir_pack64: // input and result always valid - case lir_unpack64: // input and result always valid { assert(op->as_Op1() != NULL, "must be"); LIR_Op1* op1 = (LIR_Op1*)op; @@ -1648,8 +1646,6 @@ case lir_convert: s = "convert"; break; case lir_alloc_object: s = "alloc_obj"; break; case lir_monaddr: s = "mon_addr"; break; - case lir_pack64: s = "pack64"; break; - case lir_unpack64: s = "unpack64"; break; // LIR_Op2 case lir_cmp: s = "cmp"; break; case lir_cmp_l2i: s = "cmp_l2i"; break; --- old/src/hotspot/share/c1/c1_LIR.hpp 2020-05-06 16:17:40.015816837 -0700 +++ new/src/hotspot/share/c1/c1_LIR.hpp 2020-05-06 16:17:39.623809321 -0700 @@ -913,8 +913,6 @@ , lir_monaddr , lir_roundfp , lir_safepoint - , lir_pack64 - , lir_unpack64 , lir_unwind , end_op1 , begin_op2 @@ -2109,9 +2107,6 @@ void logical_or (LIR_Opr left, LIR_Opr right, LIR_Opr dst) { append(new LIR_Op2(lir_logic_or, left, right, dst)); } void logical_xor (LIR_Opr left, LIR_Opr right, LIR_Opr dst) { append(new LIR_Op2(lir_logic_xor, left, right, dst)); } - void pack64(LIR_Opr src, LIR_Opr dst) { append(new LIR_Op1(lir_pack64, src, dst, T_LONG, lir_patch_none, NULL)); } - void unpack64(LIR_Opr src, LIR_Opr dst) { append(new LIR_Op1(lir_unpack64, src, dst, T_LONG, lir_patch_none, NULL)); } - void null_check(LIR_Opr opr, CodeEmitInfo* info, bool deoptimize_on_null = false); void throw_exception(LIR_Opr exceptionPC, LIR_Opr exceptionOop, CodeEmitInfo* info) { append(new LIR_Op2(lir_throw, exceptionPC, exceptionOop, LIR_OprFact::illegalOpr, info)); --- old/src/hotspot/share/gc/g1/g1HeapRegionAttr.hpp 2020-05-06 16:17:41.035836392 -0700 +++ new/src/hotspot/share/gc/g1/g1HeapRegionAttr.hpp 2020-05-06 16:17:40.703830027 -0700 @@ -32,8 +32,6 @@ // lookups for that information all over the place. struct G1HeapRegionAttr { public: - // We use different types to represent the state value depending on platform as - // some have issues loading parts of words. typedef int8_t region_type_t; typedef uint8_t needs_remset_update_t; --- old/src/hotspot/share/gc/shared/gcVMOperations.cpp 2020-05-06 16:17:42.059856025 -0700 +++ new/src/hotspot/share/gc/shared/gcVMOperations.cpp 2020-05-06 16:17:41.679848740 -0700 @@ -55,12 +55,10 @@ void VM_GC_Operation::notify_gc_begin(bool full) { HOTSPOT_GC_BEGIN( full); - HS_DTRACE_WORKAROUND_TAIL_CALL_BUG(); } void VM_GC_Operation::notify_gc_end() { HOTSPOT_GC_END(); - HS_DTRACE_WORKAROUND_TAIL_CALL_BUG(); } // Allocations may fail in several threads at about the same time, --- old/src/hotspot/share/gc/shared/memset_with_concurrent_readers.hpp 2020-05-06 16:17:43.111876195 -0700 +++ new/src/hotspot/share/gc/shared/memset_with_concurrent_readers.hpp 2020-05-06 16:17:42.727868833 -0700 @@ -32,8 +32,6 @@ // Fill a block of memory with value, like memset, but with the // understanding that there may be concurrent readers of that memory. -void memset_with_concurrent_readers(void* to, int value, size_t size); - inline void memset_with_concurrent_readers(void* to, int value, size_t size) { ::memset(to, value, size); } --- old/src/hotspot/share/opto/generateOptoStub.cpp 2020-05-06 16:17:44.151896135 -0700 +++ new/src/hotspot/share/opto/generateOptoStub.cpp 2020-05-06 16:17:43.771888849 -0700 @@ -222,7 +222,7 @@ // Clear last_Java_sp store_to_memory(NULL, adr_sp, null(), T_ADDRESS, NoAlias, MemNode::unordered); - // Clear last_Java_pc and (optionally)_flags + // Clear last_Java_pc store_to_memory(NULL, adr_last_Java_pc, null(), T_ADDRESS, NoAlias, MemNode::unordered); #if (defined(IA64) && !defined(AIX)) Node* adr_last_Java_fp = basic_plus_adr(top(), thread, in_bytes(JavaThread::last_Java_fp_offset())); --- old/src/hotspot/share/runtime/abstract_vm_version.cpp 2020-05-06 16:17:45.135915001 -0700 +++ new/src/hotspot/share/runtime/abstract_vm_version.cpp 2020-05-06 16:17:44.807908712 -0700 @@ -238,20 +238,6 @@ #else #define HOTSPOT_BUILD_COMPILER "unknown MS VC++:" XSTR(_MSC_VER) #endif - #elif defined(__SUNPRO_CC) - #if __SUNPRO_CC == 0x580 - #define HOTSPOT_BUILD_COMPILER "Workshop 5.8" - #elif __SUNPRO_CC == 0x590 - #define HOTSPOT_BUILD_COMPILER "Workshop 5.9" - #elif __SUNPRO_CC == 0x5100 - #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u1" - #elif __SUNPRO_CC == 0x5120 - #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u3" - #elif __SUNPRO_CC == 0x5130 - #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u4" - #else - #define HOTSPOT_BUILD_COMPILER "unknown Workshop:" XSTR(__SUNPRO_CC) - #endif #elif defined(__clang_version__) #define HOTSPOT_BUILD_COMPILER "clang " __VERSION__ #elif defined(__GNUC__) --- old/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp 2020-05-06 16:17:46.215935707 -0700 +++ new/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp 2020-05-06 16:17:45.799927731 -0700 @@ -233,10 +233,6 @@ return JVMFlag::SUCCESS; } -JVMFlag::Error CompilerThreadPriorityConstraintFunc(intx value, bool verbose) { - return JVMFlag::SUCCESS; -} - JVMFlag::Error CodeEntryAlignmentConstraintFunc(intx value, bool verbose) { if (!is_power_of_2(value)) { JVMFlag::printError(verbose, --- old/src/hotspot/share/runtime/frame.cpp 2020-05-06 16:17:47.363957717 -0700 +++ new/src/hotspot/share/runtime/frame.cpp 2020-05-06 16:17:46.943949665 -0700 @@ -1039,9 +1039,6 @@ void frame::oops_do_internal(OopClosure* f, CodeBlobClosure* cf, RegisterMap* map, bool use_interpreter_oop_map_cache) { #ifndef PRODUCT -#if defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x5140 -#pragma error_messages(off, SEC_NULL_PTR_DEREF) -#endif // simulate GC crash here to dump java thread in error report if (CrashGCForDumpingJavaThread) { char *t = NULL; --- old/src/hotspot/share/runtime/globals.hpp 2020-05-06 16:17:48.487979267 -0700 +++ new/src/hotspot/share/runtime/globals.hpp 2020-05-06 16:17:48.099971829 -0700 @@ -1848,7 +1848,6 @@ "The native priority at which compiler threads should run " \ "(-1 means no change)") \ range(min_jint, max_jint) \ - constraint(CompilerThreadPriorityConstraintFunc, AfterErgo) \ \ product(intx, VMThreadPriority, -1, \ "The native priority at which the VM thread should run " \ @@ -2386,8 +2385,7 @@ "do not map the archive") \ range(0, 2) \ \ - experimental(size_t, ArrayAllocatorMallocLimit, \ - (size_t)-1, \ + experimental(size_t, ArrayAllocatorMallocLimit, (size_t)-1, \ "Allocation less than this value will be allocated " \ "using malloc. Larger allocations will use mmap.") \ \ --- old/src/hotspot/share/runtime/java.cpp 2020-05-06 16:17:49.624001048 -0700 +++ new/src/hotspot/share/runtime/java.cpp 2020-05-06 16:17:49.247993838 -0700 @@ -563,7 +563,6 @@ void notify_vm_shutdown() { // For now, just a dtrace probe. HOTSPOT_VM_SHUTDOWN(); - HS_DTRACE_WORKAROUND_TAIL_CALL_BUG(); } void vm_direct_exit(int code) { --- old/src/hotspot/share/utilities/dtrace.hpp 2020-05-06 16:17:50.704021754 -0700 +++ new/src/hotspot/share/utilities/dtrace.hpp 2020-05-06 16:17:50.324014469 -0700 @@ -29,19 +29,11 @@ #if defined(DTRACE_ENABLED) #include +#include #define DTRACE_ONLY(x) x #define NOT_DTRACE(x) -#if defined(LINUX) -#define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() -#elif defined(__APPLE__) -#define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() -#include -#else -#error "dtrace enabled for unknown os" -#endif /* defined(LINUX) */ - #include "dtracefiles/hotspot.h" #include "dtracefiles/hotspot_jni.h" #include "dtracefiles/hs_private.h" @@ -51,8 +43,6 @@ #define DTRACE_ONLY(x) #define NOT_DTRACE(x) x -#define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() - #include "dtrace_disabled.hpp" #endif /* defined(DTRACE_ENABLED) */ --- old/src/hotspot/share/utilities/vmError.cpp 2020-05-06 16:17:51.712041080 -0700 +++ new/src/hotspot/share/utilities/vmError.cpp 2020-05-06 16:17:51.380034714 -0700 @@ -1732,9 +1732,6 @@ } #ifndef PRODUCT -#if defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x5140 -#pragma error_messages(off, SEC_NULL_PTR_DEREF) -#endif typedef void (*voidfun_t)(); // Crash with an authentic sigfpe static void crash_with_sigfpe() { --- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java 2020-05-06 16:17:52.816062247 -0700 +++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java 2020-05-06 16:17:52.428054807 -0700 @@ -550,7 +550,6 @@ assert config.cipherBlockChainingEncryptAESCryptStub != 0L; assert config.cipherBlockChainingDecryptAESCryptStub != 0L; String arch = config.osArch; - String decryptSuffix = ""; Registration r = new Registration(plugins, "com.sun.crypto.provider.CipherBlockChaining", replacements); @@ -559,7 +558,7 @@ byte[].class, int.class); Pair cbcDecryptName = selectIntrinsicName(config, "com/sun/crypto/provider/CipherBlockChaining", "implDecrypt", "decrypt"); - registerAndCheckMismatch(r, CipherBlockChainingSubstitutions.class, cbcDecryptName, cbcDecryptName.getLeft() + decryptSuffix, Receiver.class, byte[].class, int.class, int.class, + registerAndCheckMismatch(r, CipherBlockChainingSubstitutions.class, cbcDecryptName, cbcDecryptName.getLeft(), Receiver.class, byte[].class, int.class, int.class, byte[].class, int.class); r = new Registration(plugins, "com.sun.crypto.provider.AESCrypt", replacements); @@ -568,7 +567,7 @@ registerAndCheckMismatch(r, AESCryptSubstitutions.class, aesEncryptName, Receiver.class, byte[].class, int.class, byte[].class, int.class); Pair aesDecryptName = selectIntrinsicName(config, "com/sun/crypto/provider/AESCrypt", "implDecryptBlock", "decryptBlock"); - registerAndCheckMismatch(r, AESCryptSubstitutions.class, aesDecryptName, aesDecryptName.getLeft() + decryptSuffix, Receiver.class, byte[].class, int.class, byte[].class, int.class); + registerAndCheckMismatch(r, AESCryptSubstitutions.class, aesDecryptName, aesDecryptName.getLeft(), Receiver.class, byte[].class, int.class, byte[].class, int.class); } } --- old/src/utils/hsdis/Makefile 2020-05-06 16:17:53.936083720 -0700 +++ new/src/utils/hsdis/Makefile 2020-05-06 16:17:53.552076358 -0700 @@ -68,13 +68,13 @@ else #linux CPU = $(shell uname -m) ARCH1=$(CPU:x86_64=amd64) -ARCH2=$(ARCH1:i686=i386) +ARCH=$(ARCH1:i686=i386) ifdef LP64 CFLAGS/amd64 += -m64 CFLAGS/ppc64 += -m64 CFLAGS/ppc64le += -m64 -DABI_ELFv2 else -ARCH=$(ARCH2:amd64=i386) +ARCH=$(ARCH1:amd64=i386) ifneq ($(findstring arm,$(ARCH)),) ARCH=arm endif