jdk-17.0.16-ga

Author: psumbera

jdk-17.sh

@@ -20,7 +20,7 @@ CONFIGURE_OPTIONS+=" CXX=$GXX"
 
 git clone ${JDK_GITHUB_REPO}/$SRC_DIR "$BUILD_DIR"/$SRC_DIR
 cd "$BUILD_DIR"/$SRC_DIR
-git checkout jdk-17.0.11-ga
+git checkout jdk-17.0.16-ga
 
 apply_patch_series
 

patches-17/0001-8264868-Reduce-inclusion-of-registerMap.hpp-and-regi.patch

@@ -597,13 +597,6 @@ diff --git a/src/hotspot/share/runtime/vframeArray.hpp b/src/hotspot/share/runti
 index 25ed7fd5ed8..fa2ab054186 100644
 --- a/src/hotspot/share/runtime/vframeArray.hpp
 +++ b/src/hotspot/share/runtime/vframeArray.hpp
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
 @@ -30,6 +30,7 @@
  #include "runtime/deoptimization.hpp"
  #include "runtime/frame.hpp"

patches-17/0001-8268702-JFR-diagnostic-commands-lack-argument-descri.patch

@@ -32,15 +32,15 @@ index f821de98a51..d5d1aca378e 100644
  #include "memory/resourceArea.hpp"
  #include "oops/objArrayOop.inline.hpp"
  #include "oops/oop.inline.hpp"
-@@ -219,7 +220,6 @@ void JfrDCmd::invoke(JfrJavaArguments& method, TRAPS) const {
+@@ -236,7 +237,6 @@ void JfrDCmd::invoke(JfrJavaArguments& method, TRAPS) const {
    JfrJavaArguments constructor_args(&constructor_result);
    constructor_args.set_klass(javaClass(), CHECK);
 
 -  ResourceMark rm(THREAD);
    HandleMark hm(THREAD);
    JNIHandleBlockManager jni_handle_management(THREAD);
 
-@@ -241,12 +241,10 @@ void JfrDCmd::parse(CmdLine* line, char delim, TRAPS) {
+@@ -258,12 +258,10 @@ void JfrDCmd::parse(CmdLine* line, char delim, TRAPS) {
  }
 
  void JfrDCmd::execute(DCmdSource source, TRAPS) {
@@ -54,7 +54,7 @@ index f821de98a51..d5d1aca378e 100644
    JavaValue result(T_OBJECT);
    JfrJavaArguments execute(&result, javaClass(), "execute", signature, CHECK);
    jstring argument = JfrJavaSupport::new_string(_args, CHECK);
-@@ -271,13 +269,92 @@ void JfrDCmd::print_help(const char* name) const {
+@@ -288,13 +286,92 @@ void JfrDCmd::print_help(const char* name) const {
    static const char signature[] = "()[Ljava/lang/String;";
    JavaThread* thread = JavaThread::current();
    JavaValue result(T_OBJECT);
@@ -150,7 +150,7 @@ index f821de98a51..d5d1aca378e 100644
  }
 
  GrowableArray<const char*>* JfrDCmd::argument_name_array() const {
-@@ -387,7 +464,6 @@ void JfrConfigureFlightRecorderDCmd::execute(DCmdSource source, TRAPS) {
+@@ -404,7 +481,6 @@ void JfrConfigureFlightRecorderDCmd::execute(DCmdSource source, TRAPS) {
      return;
    }
 

patches-17/0001-8270491-SEGV-at-read_string_field-oopDesc-char-const.patch

@@ -14,7 +14,7 @@ diff --git a/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp b/src/hotspot/share/jfr/dcm
 index d5d1aca378e..875e7f8e475 100644
 --- a/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
 +++ b/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
-@@ -154,19 +154,19 @@ static void print_message(outputStream* output, oop content, TRAPS) {
+@@ -171,19 +171,19 @@ static void print_message(outputStream* output, oop content, TRAPS) {
  }
 
  static void log(oop content, TRAPS) {
@@ -46,7 +46,7 @@ index d5d1aca378e..875e7f8e475 100644
  }
 
  static void handle_dcmd_result(outputStream* output,
-@@ -215,6 +215,8 @@ static oop construct_dcmd_instance(JfrJavaArguments* args, TRAPS) {
+@@ -232,6 +232,8 @@ static oop construct_dcmd_instance(JfrJavaArguments* args, TRAPS) {
    return args->result()->get_oop();
  }
 
@@ -55,7 +55,7 @@ index d5d1aca378e..875e7f8e475 100644
  void JfrDCmd::invoke(JfrJavaArguments& method, TRAPS) const {
    JavaValue constructor_result(T_OBJECT);
    JfrJavaArguments constructor_args(&constructor_result);
-@@ -274,6 +276,20 @@ void JfrDCmd::print_help(const char* name) const {
+@@ -291,6 +293,20 @@ void JfrDCmd::print_help(const char* name) const {
    handle_dcmd_result(output(), result.get_oop(), DCmd_Source_MBean, thread);
  }
 
@@ -76,7 +76,7 @@ index d5d1aca378e..875e7f8e475 100644
  // Since the DcmdFramework does not support dynamically allocated strings,
  // we keep them in a thread local arena. The arena is reset between invocations.
  static THREAD_LOCAL Arena* dcmd_arena = NULL;
-@@ -340,16 +356,29 @@ static DCmdArgumentInfo* create_info(oop argument, TRAPS) {
+@@ -357,16 +373,29 @@ static DCmdArgumentInfo* create_info(oop argument, TRAPS) {
  GrowableArray<DCmdArgumentInfo*>* JfrDCmd::argument_info_array() const {
    static const char signature[] = "()[Ljdk/jfr/internal/dcmd/Argument;";
    JavaThread* thread = JavaThread::current();

patches-17/0001-8282477-x86-aarch64-vmassert-_last_Java_pc-NULL-alre.patch

@@ -260,7 +260,7 @@ diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java
 index 820bb5c3505..996bb7dbca1 100644
 --- a/src/hotspot/share/runtime/java.cpp
 +++ b/src/hotspot/share/runtime/java.cpp
-@@ -614,7 +614,7 @@ void vm_perform_shutdown_actions() {
+@@ -617,7 +617,7 @@ void vm_perform_shutdown_actions() {
        JavaThread* jt = thread->as_Java_thread();
        // Must always be walkable or have no last_Java_frame when in
        // thread_in_native
@@ -286,7 +286,7 @@ diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/th
 index 8aed9a450b6..50ecc4d4688 100644
 --- a/src/hotspot/share/runtime/thread.cpp
 +++ b/src/hotspot/share/runtime/thread.cpp
-@@ -1711,7 +1711,7 @@ void JavaThread::check_and_handle_async_exceptions() {
+@@ -1677,7 +1677,7 @@ void JavaThread::check_and_handle_async_exceptions() {
  void JavaThread::handle_special_runtime_exit_condition(bool check_asyncs) {
 
    if (is_obj_deopt_suspend()) {
@@ -299,7 +299,7 @@ diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/th
 index 9700d6be2a5..9a3fe0efe6e 100644
 --- a/src/hotspot/share/runtime/thread.hpp
 +++ b/src/hotspot/share/runtime/thread.hpp
-@@ -1440,7 +1440,7 @@ class JavaThread: public Thread {
+@@ -1429,7 +1429,7 @@ class JavaThread: public Thread {
   public:
    // Accessing frames
    frame last_frame() {

patches-17/0001-8283520-JFR-Memory-leak-in-dcmd_arena.patch

@@ -22,7 +22,7 @@ index 875e7f8e475..a21a4fa7d48 100644
  #include "logging/log.hpp"
  #include "logging/logConfiguration.hpp"
  #include "logging/logMessage.hpp"
-@@ -294,12 +295,10 @@ static void initialize_dummy_descriptors(GrowableArray<DCmdArgumentInfo*>* array
+@@ -311,12 +312,10 @@ static void initialize_dummy_descriptors(GrowableArray<DCmdArgumentInfo*>* array
  // we keep them in a thread local arena. The arena is reset between invocations.
  static THREAD_LOCAL Arena* dcmd_arena = NULL;
 
@@ -39,7 +39,7 @@ index 875e7f8e475..a21a4fa7d48 100644
  }
 
  static char* dcmd_arena_allocate(size_t size) {
-@@ -307,7 +306,7 @@ static char* dcmd_arena_allocate(size_t size) {
+@@ -324,7 +323,7 @@ static char* dcmd_arena_allocate(size_t size) {
    return (char*)dcmd_arena->Amalloc(size);
  }
 
@@ -48,7 +48,7 @@ index 875e7f8e475..a21a4fa7d48 100644
    char* str = NULL;
    const typeArrayOop value = java_lang_String::value(string);
    if (value != NULL) {
-@@ -328,7 +327,7 @@ static const char* read_string_field(oop argument, const char* field_name, TRAPS
+@@ -345,7 +344,7 @@ static const char* read_string_field(oop argument, const char* field_name, TRAPS
    args.set_receiver(argument);
    JfrJavaSupport::get_field(&args, THREAD);
    const oop string_oop = result.get_oop();
@@ -57,7 +57,7 @@ index 875e7f8e475..a21a4fa7d48 100644
  }
 
  static bool read_boolean_field(oop argument, const char* field_name, TRAPS) {
-@@ -377,7 +376,7 @@ GrowableArray<DCmdArgumentInfo*>* JfrDCmd::argument_info_array() const {
+@@ -394,7 +393,7 @@ GrowableArray<DCmdArgumentInfo*>* JfrDCmd::argument_info_array() const {
    assert(arguments->is_array(), "must be array");
    const int num_arguments = arguments->length();
    assert(num_arguments == _num_arguments, "invariant");

patches-17/0048-8256205-Simplify-compiler-calling-convention-handlin.patch

@@ -244,7 +244,7 @@ diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
 index 27dad6cff94..8bbbc3d4aa3 100644
 --- a/src/hotspot/cpu/ppc/ppc.ad
 +++ b/src/hotspot/cpu/ppc/ppc.ad
-@@ -3764,8 +3764,6 @@ frame %{
+@@ -3775,8 +3775,6 @@ frame %{
 
    stack_alignment(frame::alignment_in_bytes);
 
@@ -253,7 +253,7 @@ index 27dad6cff94..8bbbc3d4aa3 100644
    // Number of outgoing stack slots killed above the
    // out_preserve_stack_slots for calls to C. Supports the var-args
    // backing area for register parms.
-@@ -3790,40 +3788,6 @@ frame %{
+@@ -3801,40 +3799,6 @@ frame %{
    //    4 what apparently works and saves us some spills.
    return_addr(STACK 4);
 
@@ -323,7 +323,7 @@ diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad
 index 98194c73047..9a574ac0854 100644
 --- a/src/hotspot/cpu/s390/s390.ad
 +++ b/src/hotspot/cpu/s390/s390.ad
-@@ -2366,8 +2366,6 @@ frame %{
+@@ -2368,8 +2368,6 @@ frame %{
    // Use alignment_in_bytes instead of log_2_of_alignment_in_bits.
    stack_alignment(frame::alignment_in_bytes);
 
@@ -332,7 +332,7 @@ index 98194c73047..9a574ac0854 100644
    // A `slot' is assumed 4 bytes here!
    // out_preserve_stack_slots(frame::jit_out_preserve_size_in_4_byte_units);
 
-@@ -2382,38 +2380,6 @@ frame %{
+@@ -2384,38 +2382,6 @@ frame %{
    // stack slot.
    return_addr(REG Z_R14);
 
@@ -589,7 +589,7 @@ diff --git a/src/hotspot/share/adlc/adlparse.cpp b/src/hotspot/share/adlc/adlpar
 index 7d62f861686..ecb722c56b2 100644
 --- a/src/hotspot/share/adlc/adlparse.cpp
 +++ b/src/hotspot/share/adlc/adlparse.cpp
-@@ -1019,7 +1019,8 @@ void ADLParser::frame_parse(void) {
+@@ -1020,7 +1020,8 @@ void ADLParser::frame_parse(void) {
          return_addr_parse(frame, false);
        }
        if (strcmp(token,"in_preserve_stack_slots")==0) {
@@ -599,7 +599,7 @@ index 7d62f861686..ecb722c56b2 100644
        }
        if (strcmp(token,"out_preserve_stack_slots")==0) {
          parse_err(WARN, "Using obsolete token, out_preserve_stack_slots");
-@@ -1029,7 +1030,8 @@ void ADLParser::frame_parse(void) {
+@@ -1030,7 +1031,8 @@ void ADLParser::frame_parse(void) {
          frame->_varargs_C_out_slots_killed = parse_one_arg("varargs C out slots killed");
        }
        if (strcmp(token,"calling_convention")==0) {
@@ -609,7 +609,7 @@ index 7d62f861686..ecb722c56b2 100644
        }
        if (strcmp(token,"return_value")==0) {
          frame->_return_value = return_value_parse();
-@@ -1041,7 +1043,8 @@ void ADLParser::frame_parse(void) {
+@@ -1042,7 +1044,8 @@ void ADLParser::frame_parse(void) {
          return_addr_parse(frame, true);
        }
        if (strcmp(token,"c_calling_convention")==0) {
@@ -619,7 +619,7 @@ index 7d62f861686..ecb722c56b2 100644
        }
        if (strcmp(token,"c_return_value")==0) {
          frame->_c_return_value = return_value_parse();
-@@ -1072,18 +1075,10 @@ void ADLParser::frame_parse(void) {
+@@ -1073,18 +1076,10 @@ void ADLParser::frame_parse(void) {
      parse_err(SYNERR, "missing return address location in frame section.\n");
      return;
    }
@@ -638,7 +638,7 @@ index 7d62f861686..ecb722c56b2 100644
    if(frame->_return_value == NULL) {
      parse_err(SYNERR, "missing return value definition in frame section.\n");
      return;
-@@ -1096,9 +1091,6 @@ void ADLParser::frame_parse(void) {
+@@ -1097,9 +1092,6 @@ void ADLParser::frame_parse(void) {
      frame->_c_return_addr = frame->_return_addr;
      frame->_c_return_addr_loc = frame->_return_addr_loc;
    }
@@ -648,7 +648,7 @@ index 7d62f861686..ecb722c56b2 100644
    if(frame->_c_return_value == NULL) {
      frame->_c_return_value = frame->_return_value;
    }
-@@ -1221,37 +1213,9 @@ void ADLParser::return_addr_parse(FrameForm *frame, bool native) {
+@@ -1222,37 +1214,9 @@ void ADLParser::return_addr_parse(FrameForm *frame, bool native) {
    }
  }
 
@@ -734,7 +734,7 @@ diff --git a/src/hotspot/share/adlc/output_c.cpp b/src/hotspot/share/adlc/output
 index c6083533b58..a044ceab00b 100644
 --- a/src/hotspot/share/adlc/output_c.cpp
 +++ b/src/hotspot/share/adlc/output_c.cpp
-@@ -4160,29 +4160,15 @@ void ArchDesc::buildFrameMethods(FILE *fp_cpp) {
+@@ -4175,29 +4175,15 @@ void ArchDesc::buildFrameMethods(FILE *fp_cpp) {
      fprintf(fp_cpp," return OptoReg::stack2reg(%s); }\n\n",
              _frame->_return_addr);
    }

patches-17/README-zero.txt

@@ -0,0 +1,44 @@
+"Zero is a port of OpenJDK that uses no assembler and therefore can
+trivially be built on any system."
+
+https://openjdk.org/projects/zero/
+
+The idea here is to potentially have an illumos port of zero. It's not
+so interesting on x86, for which we have a proper port anyway, but if
+we can get zero to work on x86 then it should be possible to get it to
+work on sparc too.
+
+It still needs the basic solaris patchset. It's designed more to support
+new hardware architectures (hence the zero assembler) than as a way to
+do an OS port.
+
+There are 2 patches:
+
+illumos-zero-1.patch
+Fixes src/hotspot/cpu/zero/stubGenerator_zero.cpp
+
+illumos-zero-2.patch
+Adds the src/hotspot/os_cpu/solaris_zero directory and contents
+
+These are current and tested for jdk17u 17.0.9. They don't provide a
+proper zero port, as they still have assembler that needs to be
+removed.
+
+The two patches above are now applied by default, so we at least catch
+any source incompatibilities early.
+
+Configure:
+
+env PATH=/usr/bin:/usr/sbin:/usr/sfw/bin:/usr/gnu/bin bash ./configure \
+--enable-unlimited-crypto --with-boot-jdk=/usr/jdk/instances/jdk16 \
+--with-native-debug-symbols=none \
+--with-toolchain-type=gcc \
+--disable-dtrace \
+--disable-warnings-as-errors \
+--enable-deprecated-ports=yes \
+--enable-jvm-feature-zero --with-jvm-variants=zero \
+--with-jobs=3
+
+build:
+
+env PATH=/usr/bin:/usr/sbin:/usr/sfw/bin:/usr/gnu/bin gmake all CONF=solaris-x86_64-zero-release

patches-17/README-zgc.txt

@@ -0,0 +1,36 @@
+The marketing blurb:
+
+The Z Garbage Collector (ZGC) is a scalable low latency garbage
+collector. ZGC performs all expensive work concurrently, without
+stopping the execution of application threads for more than a
+millisecond. It is suitable for applications which require low
+latency. Pause times are independent of the heap size that is being
+used. ZGC works well with heap sizes from a few hundred megabytes to
+16TB.
+
+It's not available on Solaris/illumos by default, but there's an
+experimental patch here that will enable it. To do that, go to the
+root of the source tree after unpacking and applying all the other
+patches, and apply with
+
+gpatch -p1 < .../illumos-zgc.patch
+
+This patch does 2 things:
+
+1. Patches make/autoconf/jvm-features.m4 to add solaris (just x86) to
+the platforms that zgc will be built on.
+
+2. Adds a basic implementation of support for zgc under the
+src/hotspot/os/solaris/gc directory.
+
+The support files are a mishmash of the bsd and linux
+implementations. Mostly the simple bsd skeleton, with mmap() instead
+of the bsd mremap(), using MAP_ANONYMOUS to simply get an anonymous
+mapping.
+
+It can be enabled via the flag
+
+java -XX:+UseZGC ...
+
+Initial testing indicates that it does work, although some crashes
+have been seen.