Mercurial > hg > icedtea8
view patches/hotspot/shenandoah/8062808-pr3548.patch @ 2972:ca45ee064071
Bump shenandoah to aarch64-shenandoah-jdk8u272-b10.
Upstream changes:
- [backport] 8241007: Shenandoah: remove ShenandoahCriticalControlThreadPriority support
- [backport] 8241574: Shenandoah: remove ShenandoahAssertToSpaceClosure
- [backport] 8242375: Shenandoah: Remove ShenandoahHeuristic::record_gc_start/end methods
- [backport] 8244509: Shenandoah: refactor ShenandoahBarrierC2Support::test_* methods
- [backport] 8244667: Shenandoah: SBC2Support::test_gc_state takes loop for wrong control
- [backport] 8245464: Shenandoah: allocate collection set bitmap at lower addresses
- [backport] 8245465: Shenandoah: test_in_cset can use more efficient encoding
- [backport] 8245773: Shenandoah: Windows assertion failure after JDK-8245464
- [backport] 8247367: Shenandoah: pacer should wait on lock instead of exponential backoff
- [backport] 8247593: Shenandoah: should not block pacing reporters
- [backport] 8247751: Shenandoah: options tests should run with smaller heaps
- [backport] 8247754: Shenandoah: mxbeans tests can be shorter
- [backport] 8247757: Shenandoah: split heavy tests by heuristics to improve parallelism
- [backport] 8247860: Shenandoah: add update watermark line in rich assert failure message
- [backport] 8248041: Shenandoah: pre-Full GC root updates may miss some roots
- [backport] 8248652: Shenandoah: SATB buffer handling may assume no forwarded objects
- [backport] 8249560: Shenandoah: Fix racy GC request handling
- [backport] 8249649: Shenandoah: provide per-cycle pacing stats
- [backport] 8249801: Shenandoah: Clear soft-refs on requested GC cycle
- [backport] 8249953: Shenandoah: gc/shenandoah/mxbeans tests should account for corner cases
- JDK-8057003: Large reference arrays cause extremely long synchronization times
- JDK-8060721: Test runtime/SharedArchiveFile/LimitSharedSizes.java fails in jdk 9 fcs new platforms/compiler
- JDK-8064319: Need to enable -XX:+TraceExceptions in release builds
- JDK-8080462: Update SunPKCS11 provider with PKCS11 v2.40 support
- JDK-8184762: ZapStackSegments should use optimized memset
- JDK-8193234: When using -Xcheck:jni an internally allocated buffer can leak
- JDK-8219919: RuntimeStub name lost with PrintFrameConverterAssembly
- JDK-8220313: [TESTBUG] Update base image for Docker testing to OL 7.6
- JDK-8222079: Don't use memset to initialize fields decode_env constructor in disassembler.cpp
- JDK-8226575: OperatingSystemMXBean should be made container aware
- JDK-8233624: Enhance JNI linkage
- JDK-8236196: Improve string pooling
- JDK-8240124: Better VM Interning
- JDK-8240676: Meet not symmetric failure when running lucene on jdk8
- JDK-8241114: Better range handling
- JDK-8243302: Advanced class supports
- JDK-8244151: Update MUSCLE PC/SC-Lite headers to the latest release 1.8.26
- JDK-8244955: Additional Fix for JDK-8240124
- JDK-8245412: Better class definitions
- JDK-8247979: aarch64: missing side effect of killing flags for clearArray_reg_reg
- JDK-8249158: THREAD_START and THREAD_END event posted in primordial phase
- JDK-8250627: Use -XX:+/-UseContainerSupport for enabling/disabling Java container metrics
- JDK-8251120: [8u] HotSpot build assumes ENABLE_JFR is set to either true or false
- JDK-8252084: Minimal VM fails to bootcycle: undefined symbol: AgeTableTracer::is_tenuring_distribution_event_enabled
- JDK-8252096: Shenandoah: adjust SerialPageShiftCount for x86_32 and JFR
- JDK-8252366: Shenandoah: revert/cleanup changes in graphKit.cpp
- JDK-8252573: 8u: Windows build failed after 8222079 backport
- JDK-8254673: Call to JvmtiExport::post_vm_start() was removed by the fix for JDK-8249158
- JDK-8254937: Revert JDK-8148854 for 8u272
- Shenandoah: enable low-frequency STW class unloading
- Shenandoah: fix forceful pacer claim
- Shenandoah: hook statistics printing to PrintGCDetails, not PrintGC
- Shenandoah: pacer should use proper Atomics for intptr_t
- Shenandoah: Zero build fails after recent Atomic cleanup in Pacer
ChangeLog:
2020-10-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
Bump shenandoah to aarch64-shenandoah-jdk8u272-b10.
* patches/hotspot/shenandoah/8251120-pr3793.patch:
Removed as applied upstream.
* Makefile.am:
(ICEDTEA_PATCHES): Only apply JDK-8251120/PR3793
on AArch32 builds as it is included upstream in
Shenandoah now.
* NEWS: Updated.
* hotspot.map.in: Bump shenandoah to
aarch64-shenandoah-jdk8u272-b10.
* patches/hotspot/aarch32/8062808-pr3548.patch,
* patches/hotspot/aarch32/8251120-pr3793.patch,
* patches/hotspot/aarch32/pr3593.patch:
Take copies of the Shenandoah patches, so they can
be changed without breaking AArch32 builds.
* patches/hotspot/shenandoah/8062808-pr3548.patch:
Adjusted following constantPool.hpp context change
in JDK-8243302.
* patches/hotspot/shenandoah/pr3593.patch,
Adjust PR3593 following g1StringDedupTable.cpp
context change in JDK-8240124 & JDK-8244955.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Mon, 26 Oct 2020 06:49:22 +0000 |
parents | 782eac406554 |
children |
line wrap: on
line source
# HG changeset patch # User stefank # Date 1525453613 -3600 # Fri May 04 18:06:53 2018 +0100 # Node ID 07a1135a327362f157955d470fad5df07cc35164 # Parent de79964656fc652f2085dac4fe99bcc128b5a3b1 8062808, PR3548: Turn on the -Wreturn-type warning Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make --- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2020-10-26 03:45:26.495908686 +0000 +++ openjdk/hotspot/make/linux/makefiles/gcc.make 2020-10-26 03:51:46.461937909 +0000 @@ -214,7 +214,7 @@ WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body -Qunused-arguments -Wno-uninitialized endif -WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value +WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wreturn-type ifeq ($(USE_CLANG),) # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad openjdk/hotspot/src/cpu/x86/vm/x86_32.ad --- openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad 2020-10-17 05:31:10.000000000 +0100 +++ openjdk/hotspot/src/cpu/x86/vm/x86_32.ad 2020-10-26 03:51:46.463937930 +0000 @@ -1255,6 +1255,7 @@ Unimplemented(); + return 0; // Mute compiler } #ifndef PRODUCT diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp --- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2020-10-26 03:45:26.348907127 +0000 +++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2020-10-26 03:51:46.464937941 +0000 @@ -541,6 +541,7 @@ err.report_and_die(); ShouldNotReachHere(); + return true; // Mute compiler } void os::Linux::init_thread_fpu_state(void) { diff -Nru openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp --- openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp 2020-10-17 05:31:10.000000000 +0100 +++ openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp 2020-10-26 03:51:46.465937952 +0000 @@ -506,7 +506,7 @@ ss.write((const char*)name->bytes(), name->utf8_length()); ss.write((const char*)signature->bytes(), signature->utf8_length()); ss.print(" is abstract"); - return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL); + return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD); } Symbol* MethodFamily::generate_conflicts_message(GrowableArray<Method*>* methods, TRAPS) const { @@ -521,7 +521,7 @@ ss.print("."); ss.write((const char*)name->bytes(), name->utf8_length()); } - return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL); + return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD); } diff -Nru openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp --- openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp 2020-10-17 05:31:10.000000000 +0100 +++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp 2020-10-26 03:51:46.465937952 +0000 @@ -249,7 +249,7 @@ MutexLocker ml(SymbolTable_lock, THREAD); // Otherwise, add to symbol to table - return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL); + return the_table()->basic_add(index, (u1*)name, len, hashValue, true, THREAD); } Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) { @@ -288,7 +288,7 @@ // Grab SymbolTable_lock first. MutexLocker ml(SymbolTable_lock, THREAD); - return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL); + return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, THREAD); } Symbol* SymbolTable::lookup_only(const char* name, int len, diff -Nru openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp --- openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp 2020-10-17 05:31:10.000000000 +0100 +++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp 2020-10-26 03:51:46.467937973 +0000 @@ -236,15 +236,15 @@ class_name->as_C_string(), class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string())); if (FieldType::is_array(class_name)) { - return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL); + return resolve_array_class_or_null(class_name, class_loader, protection_domain, THREAD); } else if (FieldType::is_obj(class_name)) { ResourceMark rm(THREAD); // Ignore wrapping L and ;. TempNewSymbol name = SymbolTable::new_symbol(class_name->as_C_string() + 1, class_name->utf8_length() - 2, CHECK_NULL); - return resolve_instance_class_or_null(name, class_loader, protection_domain, CHECK_NULL); + return resolve_instance_class_or_null(name, class_loader, protection_domain, THREAD); } else { - return resolve_instance_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL); + return resolve_instance_class_or_null(class_name, class_loader, protection_domain, THREAD); } } diff -Nru openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp openjdk/hotspot/src/share/vm/memory/heapInspection.hpp --- openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp 2020-10-17 05:31:10.000000000 +0100 +++ openjdk/hotspot/src/share/vm/memory/heapInspection.hpp 2020-10-26 03:51:46.467937973 +0000 @@ -367,7 +367,7 @@ _csv_format(csv_format), _print_help(print_help), _print_class_stats(print_class_stats), _columns(columns) {} void heap_inspection(outputStream* st) NOT_SERVICES_RETURN; - size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN; + size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN_(0); static void find_instances_at_safepoint(Klass* k, GrowableArray<oop>* result) NOT_SERVICES_RETURN; private: void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL); diff -Nru openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp --- openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp 2020-10-17 05:31:10.000000000 +0100 +++ openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp 2020-10-26 03:51:46.468937983 +0000 @@ -93,7 +93,7 @@ static void preload_and_dump(TRAPS) NOT_CDS_RETURN; static int preload_and_dump(const char * class_list_path, GrowableArray<Klass*>* class_promote_order, - TRAPS) NOT_CDS_RETURN; + TRAPS) NOT_CDS_RETURN_(0); static ReservedSpace* shared_rs() { CDS_ONLY(return _shared_rs); diff -Nru openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp openjdk/hotspot/src/share/vm/oops/constantPool.hpp --- openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp 2020-10-17 05:31:10.000000000 +0100 +++ openjdk/hotspot/src/share/vm/oops/constantPool.hpp 2020-10-26 03:52:24.750343919 +0000 @@ -353,7 +353,7 @@ Klass* klass_at(int which, TRAPS) { constantPoolHandle h_this(THREAD, this); - return klass_at_impl(h_this, which, CHECK_NULL); + return klass_at_impl(h_this, which, THREAD); } Symbol* klass_name_at(int which) const; // Returns the name, w/o resolving. diff -Nru openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp --- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp 2020-10-17 05:31:10.000000000 +0100 +++ openjdk/hotspot/src/share/vm/prims/jvm.cpp 2020-10-26 03:51:46.470938005 +0000 @@ -4375,7 +4375,7 @@ JVM_DTraceProvider* providers)) JVMWrapper("JVM_DTraceActivate"); return DTraceJSDT::activate( - version, module_name, providers_count, providers, CHECK_0); + version, module_name, providers_count, providers, THREAD); JVM_END JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method)) diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp openjdk/hotspot/src/share/vm/runtime/reflection.cpp --- openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp 2020-10-17 05:31:10.000000000 +0100 +++ openjdk/hotspot/src/share/vm/runtime/reflection.cpp 2020-10-26 03:51:46.471938015 +0000 @@ -1093,7 +1093,7 @@ } else { if (rtype == T_BOOLEAN || rtype == T_BYTE || rtype == T_CHAR || rtype == T_SHORT) narrow((jvalue*) result.get_value_addr(), rtype, CHECK_NULL); - return box((jvalue*) result.get_value_addr(), rtype, CHECK_NULL); + return box((jvalue*) result.get_value_addr(), rtype, THREAD); } } diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp --- openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp 2020-10-17 05:31:10.000000000 +0100 +++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp 2020-10-26 03:51:46.472938026 +0000 @@ -1045,7 +1045,7 @@ // last java frame on stack (which includes native call frames) vframeStream vfst(thread, true); // Do not skip and javaCalls - return find_callee_info_helper(thread, vfst, bc, callinfo, CHECK_(Handle())); + return find_callee_info_helper(thread, vfst, bc, callinfo, THREAD); } diff -Nru openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp openjdk/hotspot/src/share/vm/services/memTracker.hpp --- openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp 2020-10-17 05:31:10.000000000 +0100 +++ openjdk/hotspot/src/share/vm/services/memTracker.hpp 2020-10-26 03:51:46.473938037 +0000 @@ -64,7 +64,7 @@ const NativeCallStack& stack, MEMFLAGS flag = mtNone) { } static inline void record_virtual_memory_commit(void* addr, size_t size, const NativeCallStack& stack) { } static inline Tracker get_virtual_memory_uncommit_tracker() { return Tracker(); } - static inline Tracker get_virtual_memory_release_tracker() { } + static inline Tracker get_virtual_memory_release_tracker() { return Tracker(); } static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) { } static inline void record_thread_stack(void* addr, size_t size) { } static inline void release_thread_stack(void* addr, size_t size) { }