Merge branch 'upstream-master'

.github/scripts/gen-build-failure-report.sh

@@ -24,12 +24,19 @@
 # questions.
 #
 
+# Import common utils
+. report-utils.sh
+
 GITHUB_STEP_SUMMARY="$1"
 BUILD_DIR="$(ls -d build/*)"
 
 # Send signal to the do-build action that we failed
 touch "$BUILD_DIR/build-failure"
 
+# Collect hs_errs for build-time crashes, e.g. javac, jmod, jlink, CDS.
+# These usually land in make/
+hs_err_files=$(ls make/hs_err*.log 2> /dev/null || true)
+
 (
   echo '### :boom: Build failure summary'
   echo ''
@@ -46,6 +53,20 @@ touch "$BUILD_DIR/build-failure"
   echo '</details>'
   echo ''
 
+  for hs_err in $hs_err_files; do
+    echo "<details><summary><b>View HotSpot error log: "$hs_err"</b></summary>"
+    echo ''
+    echo '```'
+    echo "$hs_err:"
+    echo ''
+    cat "$hs_err"
+    echo '```'
+    echo '</details>'
+    echo ''
+  done
+
   echo ''
   echo ':arrow_right: To see the entire test log, click the job in the list to the left. To download logs, see the `failure-logs` [artifact above](#artifacts).'
 ) >> $GITHUB_STEP_SUMMARY
+
+truncate_summary

.github/scripts/gen-test-results.sh

@@ -24,6 +24,9 @@
 # questions.
 #
 
+# Import common utils
+. report-utils.sh
+
 GITHUB_STEP_SUMMARY="$1"
 
 test_suite_name=$(cat build/run-test-prebuilt/test-support/test-last-ids.txt)
@@ -89,18 +92,6 @@ for test in $failures $errors; do
   fi
 done >> $GITHUB_STEP_SUMMARY
 
-# With many failures, the summary can easily exceed 1024 kB, the limit set by Github
-# Trim it down if so.
-summary_size=$(wc -c < $GITHUB_STEP_SUMMARY)
-if [[ $summary_size -gt 1000000 ]]; then
-  # Trim to below 1024 kB, and cut off after the last detail group
-  head -c 1000000 $GITHUB_STEP_SUMMARY | tac | sed -n -e '/<\/details>/,$ p' | tac > $GITHUB_STEP_SUMMARY.tmp
-  mv $GITHUB_STEP_SUMMARY.tmp $GITHUB_STEP_SUMMARY
-  (
-    echo ''
-    echo ':x: **WARNING: Summary is too large and has been truncated.**'
-    echo ''
-  )  >> $GITHUB_STEP_SUMMARY
-fi
-
 echo ':arrow_right: To see the entire test log, click the job in the list to the left.'  >> $GITHUB_STEP_SUMMARY
+
+truncate_summary

.github/scripts/report-utils.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+#
+# Copyright (c) 2024, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+function truncate_summary() {
+  # With large hs_errs, the summary can easily exceed 1024 kB, the limit set by Github
+  # Trim it down if so.
+  summary_size=$(wc -c < $GITHUB_STEP_SUMMARY)
+  if [[ $summary_size -gt 1000000 ]]; then
+    # Trim to below 1024 kB, and cut off after the last detail group
+    head -c 1000000 $GITHUB_STEP_SUMMARY | tac | sed -n -e '/<\/details>/,$ p' | tac > $GITHUB_STEP_SUMMARY.tmp
+    mv $GITHUB_STEP_SUMMARY.tmp $GITHUB_STEP_SUMMARY
+    (
+      echo ''
+      echo ':x: **WARNING: Summary is too large and has been truncated.**'
+      echo ''
+    )  >> $GITHUB_STEP_SUMMARY
+  fi
+}

make/modules/jdk.hotspot.agent/Lib.gmk

@@ -59,9 +59,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSAPROC, \
     OPTIMIZATION := HIGH, \
     EXTRA_HEADER_DIRS := java.base:libjvm, \
     DISABLED_WARNINGS_gcc := sign-compare, \
-    DISABLED_WARNINGS_gcc_LinuxDebuggerLocal.cpp := unused-variable, \
     DISABLED_WARNINGS_gcc_ps_core.c := pointer-arith, \
-    DISABLED_WARNINGS_gcc_symtab.c := unused-but-set-variable, \
     DISABLED_WARNINGS_clang := sign-compare, \
     DISABLED_WARNINGS_clang_libproc_impl.c := format-nonliteral, \
     DISABLED_WARNINGS_clang_MacosxDebuggerLocal.m := unused-variable, \

src/hotspot/cpu/aarch64/aarch64.ad

@@ -6892,36 +6892,6 @@ instruct loadConD(vRegD dst, immD con) %{
 
 // Store Instructions
 
-// Store CMS card-mark Immediate
-instruct storeimmCM0(immI0 zero, memory1 mem)
-%{
-  match(Set mem (StoreCM mem zero));
-
-  ins_cost(INSN_COST);
-  format %{ "storestore (elided)\n\t"
-            "strb zr, $mem\t# byte" %}
-
-  ins_encode(aarch64_enc_strb0(mem));
-
-  ins_pipe(istore_mem);
-%}
-
-// Store CMS card-mark Immediate with intervening StoreStore
-// needed when using CMS with no conditional card marking
-instruct storeimmCM0_ordered(immI0 zero, memory1 mem)
-%{
-  match(Set mem (StoreCM mem zero));
-
-  ins_cost(INSN_COST * 2);
-  format %{ "storestore\n\t"
-            "dmb ishst"
-            "\n\tstrb zr, $mem\t# byte" %}
-
-  ins_encode(aarch64_enc_strb0_ordered(mem));
-
-  ins_pipe(istore_mem);
-%}
-
 // Store Byte
 instruct storeB(iRegIorL2I src, memory1 mem)
 %{

src/hotspot/cpu/arm/arm.ad

@@ -4226,18 +4226,6 @@ instruct storeB(memoryB mem, store_RegI src) %{
   ins_pipe(istore_mem_reg);
 %}
 
-instruct storeCM(memoryB mem, store_RegI src) %{
-  match(Set mem (StoreCM mem src));
-  ins_cost(MEMORY_REF_COST);
-
-  size(4);
-  format %{ "STRB    $src,$mem\t! CMS card-mark byte" %}
-  ins_encode %{
-    __ strb($src$$Register, $mem$$Address);
-  %}
-  ins_pipe(istore_mem_reg);
-%}
-
 // Store Char/Short
 
 

src/hotspot/cpu/ppc/ppc.ad

@@ -6482,23 +6482,6 @@ instruct storeD(memory mem, regD src) %{
   ins_pipe(pipe_class_memory);
 %}
 
-//----------Store Instructions With Zeros--------------------------------------
-
-instruct storeCM(memory mem, immI_0 zero) %{
-  match(Set mem (StoreCM mem zero));
-  ins_cost(MEMORY_REF_COST);
-
-  format %{ "STB     #0, $mem \t// CMS card-mark byte store" %}
-  size(8);
-  ins_encode %{
-    __ li(R0, 0);
-    // No release barrier: Oops are allowed to get visible after marking.
-    guarantee($mem$$base$$Register != R1_SP, "use frame_slots_bias");
-    __ stb(R0, $mem$$disp, $mem$$base$$Register);
-  %}
-  ins_pipe(pipe_class_memory);
-%}
-
 // Convert oop pointer into compressed form.
 
 // Nodes for postalloc expand.

src/hotspot/cpu/riscv/riscv.ad

@@ -5039,41 +5039,6 @@ instruct loadConD0(fRegD dst, immD0 con) %{
   ins_pipe(fp_load_constant_d);
 %}
 
-// Store Instructions
-// Store CMS card-mark Immediate
-instruct storeimmCM0(immI0 zero, memory mem)
-%{
-  match(Set mem (StoreCM mem zero));
-
-  ins_cost(STORE_COST);
-  format %{ "storestore (elided)\n\t"
-            "sb zr, $mem\t# byte, #@storeimmCM0" %}
-
-  ins_encode %{
-    __ sb(zr, Address(as_Register($mem$$base), $mem$$disp));
-  %}
-
-  ins_pipe(istore_mem);
-%}
-
-// Store CMS card-mark Immediate with intervening StoreStore
-// needed when using CMS with no conditional card marking
-instruct storeimmCM0_ordered(immI0 zero, memory mem)
-%{
-  match(Set mem (StoreCM mem zero));
-
-  ins_cost(ALU_COST + STORE_COST);
-  format %{ "membar(StoreStore)\n\t"
-            "sb zr, $mem\t# byte, #@storeimmCM0_ordered" %}
-
-  ins_encode %{
-    __ membar(MacroAssembler::LoadStore | MacroAssembler::StoreStore);
-    __ sb(zr, Address(as_Register($mem$$base), $mem$$disp));
-  %}
-
-  ins_pipe(istore_mem);
-%}
-
 // Store Byte
 instruct storeB(iRegIorL2I src, memory mem)
 %{

src/hotspot/cpu/s390/s390.ad

@@ -4226,28 +4226,6 @@ instruct storeB(memory mem, iRegI src) %{
   ins_pipe(pipe_class_dummy);
 %}
 
-instruct storeCM(memory mem, immI_0 src) %{
-  match(Set mem (StoreCM mem src));
-  ins_cost(MEMORY_REF_COST);
-  // TODO: s390 port size(VARIABLE_SIZE);
-  format %{ "STC(Y)  $src,$mem\t # CMS card-mark byte (must be 0!)" %}
-  ins_encode %{
-    guarantee($mem$$index$$Register != Z_R0, "content will not be used.");
-    if ($mem$$index$$Register != noreg) {
-      // Can't use clear_mem --> load const zero and store character.
-      __ load_const_optimized(Z_R0_scratch, (long)0);
-      if (Immediate::is_uimm12($mem$$disp)) {
-        __ z_stc(Z_R0_scratch, $mem$$Address);
-      } else {
-        __ z_stcy(Z_R0_scratch, $mem$$Address);
-      }
-    } else {
-      __ clear_mem(Address($mem$$Address), 1);
-    }
-  %}
-  ins_pipe(pipe_class_dummy);
-%}
-
 // CHAR/SHORT
 
 // Store Char/Short

src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp

@@ -822,7 +822,7 @@ void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register reg_rax,
     }
     movptr(Address(thread, JavaThread::unlocked_inflated_monitor_offset()), monitor);
 
-    testl(monitor, monitor);            // Fast Unlock ZF = 0
+    orl(t, 1); // Fast Unlock ZF = 0
     jmpb(slow_path);
 
     // Recursive unlock.

src/hotspot/cpu/x86/vm_version_x86.cpp

@@ -437,6 +437,7 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
     __ cmpl(rax, 0x80000);
     __ jcc(Assembler::notEqual, vector_save_restore);
 
+#ifndef PRODUCT
     bool save_apx = UseAPX;
     VM_Version::set_apx_cpuFeatures();
     UseAPX = true;
@@ -453,6 +454,7 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
     __ movq(Address(rsi, 8), r31);
 
     UseAPX = save_apx;
+#endif
 #endif
     __ bind(vector_save_restore);
     //

src/hotspot/cpu/x86/x86_32.ad

@@ -6322,17 +6322,6 @@ instruct storeImmB(memory mem, immI8 src) %{
   ins_pipe( ialu_mem_imm );
 %}
 
-// Store CMS card-mark Immediate
-instruct storeImmCM(memory mem, immI8 src) %{
-  match(Set mem (StoreCM mem src));
-
-  ins_cost(150);
-  format %{ "MOV8   $mem,$src\t! CMS card-mark imm0" %}
-  opcode(0xC6);               /* C6 /0 */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem), Con8or32(src), ClearInstMark);
-  ins_pipe( ialu_mem_imm );
-%}
-
 // Store Double
 instruct storeDPR( memory mem, regDPR1 src) %{
   predicate(UseSSE<=1);

src/hotspot/cpu/x86/x86_64.ad

@@ -5298,32 +5298,6 @@ instruct storeImmB(memory mem, immI8 src)
   ins_pipe(ialu_mem_imm);
 %}
 
-// Store CMS card-mark Immediate
-instruct storeImmCM0_reg(memory mem, immI_0 zero)
-%{
-  predicate(UseCompressedOops && (CompressedOops::base() == nullptr));
-  match(Set mem (StoreCM mem zero));
-
-  ins_cost(125); // XXX
-  format %{ "movb    $mem, R12\t# CMS card-mark byte 0 (R12_heapbase==0)" %}
-  ins_encode %{
-    __ movb($mem$$Address, r12);
-  %}
-  ins_pipe(ialu_mem_reg);
-%}
-
-instruct storeImmCM0(memory mem, immI_0 src)
-%{
-  match(Set mem (StoreCM mem src));
-
-  ins_cost(150); // XXX
-  format %{ "movb    $mem, $src\t# CMS card-mark byte 0" %}
-  ins_encode %{
-    __ movb($mem$$Address, $src$$constant);
-  %}
-  ins_pipe(ialu_mem_imm);
-%}
-
 // Store Float
 instruct storeF(memory mem, regF src)
 %{

src/hotspot/share/adlc/forms.cpp

@@ -276,7 +276,6 @@ Form::DataType Form::is_load_from_memory(const char *opType) const {
 
 Form::DataType Form::is_store_to_memory(const char *opType) const {
   if( strcmp(opType,"StoreB")==0)  return Form::idealB;
-  if( strcmp(opType,"StoreCM")==0) return Form::idealB;
   if( strcmp(opType,"StoreC")==0)  return Form::idealC;
   if( strcmp(opType,"StoreD")==0)  return Form::idealD;
   if( strcmp(opType,"StoreF")==0)  return Form::idealF;

src/hotspot/share/adlc/formssel.cpp

@@ -3654,7 +3654,6 @@ int MatchNode::needs_ideal_memory_edge(FormDict &globals) const {
 #if INCLUDE_SHENANDOAHGC
     "ShenandoahCompareAndSwapN", "ShenandoahCompareAndSwapP", "ShenandoahWeakCompareAndSwapP", "ShenandoahWeakCompareAndSwapN", "ShenandoahCompareAndExchangeP", "ShenandoahCompareAndExchangeN",
 #endif
-    "StoreCM",
     "GetAndSetB", "GetAndSetS", "GetAndAddI", "GetAndSetI", "GetAndSetP",
     "GetAndAddB", "GetAndAddS", "GetAndAddL", "GetAndSetL", "GetAndSetN",
     "ClearArray"