Mercurial > hg > icedtea8
view patches/hotspot/shenandoah/8143245-pr3548.patch @ 2961:2c02d50412c9
Bump shenandoah to aarch64-shenandoah-jdk8u262-b01.
Upstream changes:
- JDK-8003209: JFR events for network utilization
- JDK-8030680: 292 cleanup from default method code assessment
- JDK-8041626: Shutdown tracing event
- JDK-8141056: Erroneous assignment in HeapRegionSet.cpp
- JDK-8165675: Trace event for thread park has incorrect unit for timeout
- JDK-8183925: [AArch64] Decouple crash protection from watcher thread
- JDK-8183925: Decouple crash protection from watcher thread
- JDK-8191393: Random crashes during cfree+0x1c
- JDK-8195817: JFR.stop should require name of recording
- JDK-8195818: JFR.start should increase autogenerated name by one
- JDK-8195819: Remove recording=x from jcmd JFR.check output
- JDK-8199712: [AArch64] Flight Recorder
- JDK-8199712: Flight Recorder
- JDK-8202578: Revisit location for class unload events
- JDK-8202835: jfr/event/os/TestSystemProcess.java fails on missing events
- JDK-8203287: Zero fails to build after JDK-8199712 (Flight Recorder)
- JDK-8203346: JFR: Inconsistent signature of jfr_add_string_constant
- JDK-8203664: JFR start failure after AppCDS archive created with JFR StartFlightRecording
- JDK-8203921: JFR thread sampling is missing fixes from JDK-8194552
- JDK-8203929: Limit amount of data for JFR.dump
- JDK-8205516: JFR tool
- JDK-8207392: [PPC64] Implement JFR profiling
- JDK-8209960: -Xlog:jfr* doesn't work with the JFR
- JDK-8210024: JFR calls virtual is_Java_thread from ~Thread()
- JDK-8210776: Upgrade X Window System 6.8.2 to the latest XWD 1.0.7
- JDK-8211239: Build fails without JFR: empty JFR events signatures mismatch
- JDK-8213015: Inconsistent settings between JFR.configure and -XX:FlightRecorderOptions
- JDK-8213421: Line number information for execution samples always 0
- JDK-8213617: JFR should record the PID of the recorded process
- JDK-8213966: The ZGC JFR events should be marked as experimental
- JDK-8214542: JFR: Old Object Sample event slow on a deep heap in debug builds
- JDK-8215175: Inconsistencies in JFR event metadata
- JDK-8215284: Reduce noise induced by periodic task getFileSize()
- JDK-8215355: Object monitor deadlock with no threads holding the monitor (using jemalloc 5.1)
- JDK-8215961: jdk/jfr/event/os/TestCPUInformation.java fails on AArch64
- JDK-8216064: -XX:StartFlightRecording:settings= doesn't work properly
- JDK-8216486: Possibility of integer overflow in JfrThreadSampler::run()
- JDK-8216559: [JFR] Native libraries not correctly parsed from /proc/self/maps
- JDK-8216578: Remove unused/obsolete method in JFR code
- JDK-8216995: Clean up JFR command line processing
- JDK-8218935: Make jfr strncpy uses GCC 8.x friendly
- JDK-8223147: JFR Backport
- JDK-8223689: Add JFR Thread Sampling Support
- JDK-8223690: Add JFR BiasedLock Event Support
- JDK-8223691: Add JFR G1 Region Type Change Event Support
- JDK-8223692: Add JFR G1 Heap Summary Event Support
- JDK-8224172: assert(jfr_is_event_enabled(id)) failed: invariant
- JDK-8227011: Starting a JFR recording in response to JVMTI VMInit and / or Java agent premain corrupts memory
- JDK-8227605: Kitchensink fails "assert((((klass)->trace_id() & (JfrTraceIdEpoch::leakp_in_use_this_epoch_bit())) != 0)) failed: invariant"
- JDK-8229366: JFR backport allows unchecked writing to memory
- JDK-8229401: Fix JFR code cache test failures
- JDK-8229708: JFR backport code does not initialize
- JDK-8229873: 8229401 broke jdk8u-jfr-incubator
- JDK-8230707: JFR related tests are failing
- JDK-8231995: two jtreg tests failed after 8229366 is fixed
- JDK-8236008: Some backup files were accidentally left in the hotspot tree
- JDK-8238076: Fix OpenJDK 7 Bootstrap Broken by JFR Backport
- JDK-8238589: Necessary code cleanup in JFR for JDK8u
- JDK-8239476: JDK-8238589 broke windows build by moving OrderedPair
- JDK-8239867: correct over use of INCLUDE_JFR macro
- JDK-8241444: Metaspace::_class_vsm not initialized if compressed class pointers are disabled
- JDK-8241902: AIX Build broken after integration of JDK-8223147 (JFR Backport)
- JDK-8242788: Non-PCH build is broken after JDK-8191393
ChangeLog:
2020-08-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
Bump shenandoah to aarch64-shenandoah-jdk8u262-b01.
* Makefile.am:
(ICEDTEA_PATCHES): Add backport of JDK-8251120/PR3793
so that JFR in the new Shenandoah HotSpot is not partially
enabled.
* NEWS: Updated.
* hotspot.map.in: Bump shenandoah to
aarch64-shenandoah-jdk8u262-b01.
* patches/hotspot/aarch32/8143245-pr3548.patch,
* patches/hotspot/aarch32/8158260-pr2991-rh1341258.patch,
* patches/hotspot/aarch32/pr1975.patch:
Replace symlinks with copies of the Shenandoah versions, so the
Shenandoah copies can be updated to apply against the new drop.
* patches/hotspot/shenandoah/8143245-pr3548.patch:
Regenerated due to changed context in thread_linux_zero.cpp
from JDK-8203287 (JFR Zero support).
* patches/hotspot/shenandoah/8158260-pr2991-rh1341258.patch:
Regenerated due to changed globals.hpp context from
JDK-8223147 (JFR backport)
* patches/hotspot/shenandoah/8251120-pr3793.patch:
New patch so that HotSpot builds with ENABLE_JFR unset.
* patches/hotspot/shenandoah/pr1975.patch:
Regenerated due to changed g1MarkSweep.cpp context from
JDK-8223147 (JFR backport)
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Sun, 09 Aug 2020 23:37:37 +0100 |
parents | ca21b2a88044 |
children | 2ba4051a8442 |
line wrap: on
line source
# HG changeset patch # User sgehwolf # Date 1525714161 -3600 # Mon May 07 18:29:21 2018 +0100 # Node ID afb31413c73cbc06420fdb447aa90a7a38258904 # Parent bcbc64dfb629c5f188bbf59b8f986ad95963ed60 8143245, PR3548: Zero build requires disabled warnings Reviewed-by: dholmes, coleenp diff -Nru openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make --- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make 2019-01-03 15:14:40.000000000 +0000 +++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2020-07-21 03:22:17.875932021 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. # Copyright 2007, 2008 Red Hat, Inc. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # @@ -29,11 +29,6 @@ ifeq ($(JVM_VARIANT_ZEROSHARK), true) WARNING_FLAGS += -Wno-undef endif -# Suppress some warning flags that are normally turned on for hotspot, -# because some of the zero code has not been updated accordingly. -WARNING_FLAGS += -Wno-return-type \ - -Wno-format-nonliteral -Wno-format-security \ - -Wno-maybe-uninitialized # If FDLIBM_CFLAGS is non-empty it holds CFLAGS needed to be passed to diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp --- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2019-01-03 15:14:40.000000000 +0000 +++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2020-07-21 03:22:17.875932021 +0100 @@ -100,7 +100,7 @@ case T_DOUBLE: case T_VOID: return result; - default : ShouldNotReachHere(); + default : ShouldNotReachHere(); return NULL_WORD; } } diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp --- openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp 2019-01-03 15:14:40.000000000 +0000 +++ openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp 2020-07-21 03:22:17.876932032 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -62,7 +62,7 @@ } void InterpreterRuntime::SignatureHandlerGeneratorBase::push(BasicType type) { - ffi_type *ftype; + ffi_type *ftype = NULL; switch (type) { case T_VOID: ftype = &ffi_type_void; diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp --- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2019-01-03 15:14:40.000000000 +0000 +++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2020-07-21 03:22:17.876932032 +0100 @@ -1,6 +1,6 @@ /* * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. - * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. + * Copyright 2016 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -61,6 +61,7 @@ frame os::get_sender_for_C_frame(frame* fr) { ShouldNotCallThis(); + return frame(NULL, NULL); // silence compile warning. } frame os::current_frame() { @@ -98,16 +99,19 @@ address os::Linux::ucontext_get_pc(ucontext_t* uc) { ShouldNotCallThis(); + return NULL; // silence compile warnings } ExtendedPC os::fetch_frame_from_context(void* ucVoid, intptr_t** ret_sp, intptr_t** ret_fp) { ShouldNotCallThis(); + return NULL; // silence compile warnings } frame os::fetch_frame_from_context(void* ucVoid) { ShouldNotCallThis(); + return frame(NULL, NULL); // silence compile warnings } extern "C" JNIEXPORT int @@ -247,11 +251,16 @@ } #endif // !PRODUCT - const char *fmt = "caught unhandled signal %d"; char buf[64]; - sprintf(buf, fmt, sig); + sprintf(buf, "caught unhandled signal %d", sig); + +// Silence -Wformat-security warning for fatal() +PRAGMA_DIAG_PUSH +PRAGMA_FORMAT_NONLITERAL_IGNORED fatal(buf); +PRAGMA_DIAG_POP + return true; // silence compiler warnings } void os::Linux::init_thread_fpu_state(void) { @@ -260,6 +269,7 @@ int os::Linux::get_fpu_control_word() { ShouldNotCallThis(); + return -1; // silence compile warnings } void os::Linux::set_fpu_control_word(int fpu) { diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp --- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp 2019-01-03 15:14:40.000000000 +0000 +++ openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp 2020-07-21 03:22:43.949200090 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -110,6 +110,7 @@ void* ucontext, bool isInJava) { ShouldNotCallThis(); + return false; // silence compile warning } bool pd_get_top_frame_for_profiling(frame* fr_addr,