[GR-69145] Merge in tag jdk-26+13

PullRequest: labsjdk-ce/203

Author: OracleLabsAutomation

make/autoconf/flags-other.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2025, 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
@@ -115,7 +115,11 @@ AC_DEFUN([FLAGS_SETUP_ASFLAGS],
  # Force preprocessor to run, just to make sure
  BASIC_ASFLAGS="-x assembler-with-cpp"
  elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
- BASIC_ASFLAGS="-nologo -c"
+ if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
+ BASIC_ASFLAGS="-nologo"
+ else
+ BASIC_ASFLAGS="-nologo -c"
+ fi
  fi
  AC_SUBST(BASIC_ASFLAGS)
 

make/autoconf/toolchain.m4

@@ -655,8 +655,11 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
  if test "x$TOOLCHAIN_TYPE" != xmicrosoft; then
  AS="$CC -c"
  else
- if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
- # On 64 bit windows, the assembler is "ml64.exe"
+ if test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
+ # On Windows aarch64, the assembler is "armasm64.exe"
+ UTIL_LOOKUP_TOOLCHAIN_PROGS(AS, armasm64)
+ elif test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
+ # On Windows x64, the assembler is "ml64.exe"
  UTIL_LOOKUP_TOOLCHAIN_PROGS(AS, ml64)
  else
  # otherwise, the assembler is "ml.exe"

make/common/native/CompileFile.gmk

@@ -155,6 +155,12 @@ define CreateCompiledNativeFileBody
  endif
  $1_FLAGS := $$($1_FLAGS) -DASSEMBLY_SRC_FILE='"$$($1_REL_ASM_SRC)"' \
  -include $(TOPDIR)/make/data/autoheaders/assemblyprefix.h
+ else ifeq ($(TOOLCHAIN_TYPE), microsoft)
+ ifeq ($(OPENJDK_TARGET_CPU), aarch64)
+ $1_NON_ASM_EXTENSION_FLAG :=
+ else
+ $1_NON_ASM_EXTENSION_FLAG := "-Ta"
+ endif
  endif
  else ifneq ($$(filter %.cpp %.cc %.mm, $$($1_FILENAME)), )
  # Compile as a C++ or Objective-C++ file
@@ -236,7 +242,7 @@ define CreateCompiledNativeFileBody
  # For assembler calls just create empty dependency lists
  $$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
  $$($1_COMPILER) $$($1_FLAGS) \
- $(CC_OUT_OPTION)$$($1_OBJ) -Ta $$($1_SRC_FILE))) \
+ $(CC_OUT_OPTION)$$($1_OBJ) $$($1_NON_ASM_EXTENSION_FLAG) $$($1_SRC_FILE))) \
  | $(TR) -d '\r' | $(GREP) -v -e "Assembling:" || test "$$$$?" = "1" ; \
  $(ECHO) > $$($1_DEPS_FILE) ; \
  $(ECHO) > $$($1_DEPS_TARGETS_FILE)

make/jdk/src/classes/build/tools/cldrconverter/Bundle.java

@@ -79,6 +79,7 @@ static enum Type {
  "NumberElements/nan",
  "NumberElements/currencyDecimal",
  "NumberElements/currencyGroup",
+ "NumberElements/lenientMinusSigns",
  };
 
  private static final String[] TIME_PATTERN_KEYS = {

make/jdk/src/classes/build/tools/cldrconverter/LDMLParseHandler.java

@@ -844,6 +844,26 @@ public void startElement(String uri, String localName, String qName, Attributes
  });
  break;
 
+ // Lenient parsing
+ case "parseLenients":
+ if ("lenient".equals(attributes.getValue("level"))) {
+ pushKeyContainer(qName, attributes, attributes.getValue("scope"));
+ } else {
+ pushIgnoredContainer(qName);
+ }
+ break;
+
+ case "parseLenient":
+ // Use only the lenient minus sign for now
+ if (currentContainer instanceof KeyContainer kc
+ && kc.getKey().equals("number")
+ && attributes.getValue("sample").equals("-")) {
+ pushStringEntry(qName, attributes, currentNumberingSystem + "NumberElements/lenientMinusSigns");
+ } else {
+ pushIgnoredContainer(qName);
+ }
+ break;
+
  default:
  // treat anything else as a container
  pushContainer(qName, attributes);
@@ -1150,6 +1170,14 @@ public void endElement(String uri, String localName, String qName) throws SAXExc
  currentStyle = "";
  putIfEntry();
  break;
+ case "parseLenient":
+ if (currentContainer instanceof StringEntry se) {
+ // Convert to a simple concatenation of lenient minuses
+ // e.g. "[\-－﹣ ‐‑ ‒ – −⁻₋ ➖]" -> "-－﹣‐‑‒–−⁻₋➖" for the root locale
+ put(se.getKey(), se.getValue().replaceAll("[\\[\\]\\\\ ]", ""));
+ }
+ break;
+
  default:
  putIfEntry();
  }

make/src/classes/build/tools/jfr/GenerateJfrFiles.java

@@ -922,8 +922,10 @@ private static void printEvent(Printer out, TypeElement event, boolean empty) {
  }
  out.write(" using JfrEvent<Event" + event.name
  + ">::commit; // else commit() is hidden by overloaded versions in this class");
- printConstructor2(out, event, empty);
- printCommitMethod(out, event, empty);
+ if (!event.fields.isEmpty()) {
+ printConstructor2(out, event, empty);
+ printCommitMethod(out, event, empty);
+ }
  if (!empty) {
  printVerify(out, event.fields);
  }

src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp

@@ -172,9 +172,9 @@ void ShenandoahBarrierSetAssembler::satb_write_barrier_pre(MacroAssembler* masm,
 
  if (expand_call) {
  assert(pre_val != c_rarg1, "smashed arg");
- __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre), pre_val, thread);
+ __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_barrier_pre), pre_val);
  } else {
- __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre), pre_val, thread);
+ __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_barrier_pre), pre_val);
  }
 
  __ pop(saved, sp);
@@ -753,7 +753,7 @@ void ShenandoahBarrierSetAssembler::generate_c1_pre_barrier_runtime_stub(StubAss
  __ bind(runtime);
  __ push_call_clobbered_registers();
  __ load_parameter(0, pre_val);
- __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre), pre_val, thread);
+ __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_barrier_pre), pre_val);
  __ pop_call_clobbered_registers();
  __ bind(done);
 

src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp

@@ -2426,13 +2426,7 @@ void LIR_Assembler::emit_lock(LIR_OpLock* op) {
  Register hdr = op->hdr_opr()->as_pointer_register();
  Register lock = op->lock_opr()->as_pointer_register();
 
- if (LockingMode == LM_MONITOR) {
- if (op->info() != nullptr) {
- add_debug_info_for_null_check_here(op->info());
- __ null_check(obj);
- }
- __ b(*op->stub()->entry());
- } else if (op->code() == lir_lock) {
+ if (op->code() == lir_lock) {
  assert(BasicLock::displaced_header_offset_in_bytes() == 0, "lock_reg must point to the displaced header");
  int null_check_offset = __ lock_object(hdr, obj, lock, *op->stub()->entry());
  if (op->info() != nullptr) {

src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp

@@ -177,18 +177,16 @@ void C1_MacroAssembler::allocate_array(Register obj, Register len,
 }
 
 int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr, Label& slow_case) {
- Label done, fast_lock, fast_lock_done;
  int null_check_offset = 0;
 
  const Register tmp2 = Rtemp; // Rtemp should be free at c1 LIR level
  assert_different_registers(hdr, obj, disp_hdr, tmp2);
 
  assert(BasicObjectLock::lock_offset() == 0, "adjust this code");
- const ByteSize obj_offset = BasicObjectLock::obj_offset();
- const int mark_offset = BasicLock::displaced_header_offset_in_bytes();
+ assert(oopDesc::mark_offset_in_bytes() == 0, "Required by atomic instructions");
 
  // save object being locked into the BasicObjectLock
- str(obj, Address(disp_hdr, obj_offset));
+ str(obj, Address(disp_hdr, BasicObjectLock::obj_offset()));
 
  null_check_offset = offset();
 
@@ -199,95 +197,29 @@ int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr
  b(slow_case, ne);
  }
 
- assert(oopDesc::mark_offset_in_bytes() == 0, "Required by atomic instructions");
-
- if (LockingMode == LM_LIGHTWEIGHT) {
-
- Register t1 = disp_hdr; // Needs saving, probably
- Register t2 = hdr; // blow
- Register t3 = Rtemp; // blow
-
- lightweight_lock(obj /* obj */, t1, t2, t3, 1 /* savemask - save t1 */, slow_case);
- // Success: fall through
-
- } else if (LockingMode == LM_LEGACY) {
-
- // On MP platforms the next load could return a 'stale' value if the memory location has been modified by another thread.
- // That would be acceptable as ether CAS or slow case path is taken in that case.
-
- // Must be the first instruction here, because implicit null check relies on it
- ldr(hdr, Address(obj, oopDesc::mark_offset_in_bytes()));
-
- tst(hdr, markWord::unlocked_value);
- b(fast_lock, ne);
-
- // Check for recursive locking
- // See comments in InterpreterMacroAssembler::lock_object for
- // explanations on the fast recursive locking check.
- // -1- test low 2 bits
- movs(tmp2, AsmOperand(hdr, lsl, 30));
- // -2- test (hdr - SP) if the low two bits are 0
- sub(tmp2, hdr, SP, eq);
- movs(tmp2, AsmOperand(tmp2, lsr, exact_log2(os::vm_page_size())), eq);
- // If still 'eq' then recursive locking OK
- // set to zero if recursive lock, set to non zero otherwise (see discussion in JDK-8267042)
- str(tmp2, Address(disp_hdr, mark_offset));
- b(fast_lock_done, eq);
- // else need slow case
- b(slow_case);
-
-
- bind(fast_lock);
- // Save previous object header in BasicLock structure and update the header
- str(hdr, Address(disp_hdr, mark_offset));
-
- cas_for_lock_acquire(hdr, disp_hdr, obj, tmp2, slow_case);
-
- bind(fast_lock_done);
- }
- bind(done);
+ Register t1 = disp_hdr; // Needs saving, probably
+ Register t2 = hdr; // blow
+ Register t3 = Rtemp; // blow
 
+ lightweight_lock(obj, t1, t2, t3, 1 /* savemask - save t1 */, slow_case);
+ // Success: fall through
  return null_check_offset;
 }
 
 void C1_MacroAssembler::unlock_object(Register hdr, Register obj, Register disp_hdr, Label& slow_case) {
  assert_different_registers(hdr, obj, disp_hdr, Rtemp);
- Register tmp2 = Rtemp;
 
  assert(BasicObjectLock::lock_offset() == 0, "adjust this code");
- const ByteSize obj_offset = BasicObjectLock::obj_offset();
- const int mark_offset = BasicLock::displaced_header_offset_in_bytes();
-
- Label done;
-
  assert(oopDesc::mark_offset_in_bytes() == 0, "Required by atomic instructions");
 
- if (LockingMode == LM_LIGHTWEIGHT) {
+ ldr(obj, Address(disp_hdr, BasicObjectLock::obj_offset()));
 
- ldr(obj, Address(disp_hdr, obj_offset));
+ Register t1 = disp_hdr; // Needs saving, probably
+ Register t2 = hdr; // blow
+ Register t3 = Rtemp; // blow
 
- Register t1 = disp_hdr; // Needs saving, probably
- Register t2 = hdr; // blow
- Register t3 = Rtemp; // blow
-
- lightweight_unlock(obj /* object */, t1, t2, t3, 1 /* savemask (save t1) */,
- slow_case);
- // Success: Fall through
-
- } else if (LockingMode == LM_LEGACY) {
-
- // Load displaced header and object from the lock
- ldr(hdr, Address(disp_hdr, mark_offset));
- // If hdr is null, we've got recursive locking and there's nothing more to do
- cbz(hdr, done);
-
- // load object
- ldr(obj, Address(disp_hdr, obj_offset));
-
- // Restore the object header
- cas_for_lock_release(disp_hdr, hdr, obj, tmp2, slow_case);
- }
- bind(done);
+ lightweight_unlock(obj, t1, t2, t3, 1 /* savemask - save t1 */, slow_case);
+ // Success: fall through
 }
 
 #ifndef PRODUCT

src/hotspot/cpu/arm/c2_MacroAssembler_arm.cpp

@@ -81,7 +81,7 @@ void C2_MacroAssembler::fast_lock(Register Roop, Register Rbox, Register Rscratc
  assert(VM_Version::supports_ldrex(), "unsupported, yet?");
  assert_different_registers(Roop, Rbox, Rscratch, Rscratch2);
 
- Label fast_lock, done;
+ Label done;
 
  if (DiagnoseSyncOnValueBasedClasses != 0) {
  load_klass(Rscratch, Roop);
@@ -90,43 +90,10 @@ void C2_MacroAssembler::fast_lock(Register Roop, Register Rbox, Register Rscratc
  b(done, ne);
  }
 
- if (LockingMode == LM_LIGHTWEIGHT) {
-
- lightweight_lock(Roop /* obj */, Rbox /* t1 */, Rscratch /* t2 */, Rscratch2 /* t3 */,
- 1 /* savemask (save t1) */, done);
-
- // Success: set Z
- cmp(Roop, Roop);
-
- } else if (LockingMode == LM_LEGACY) {
-
- Register Rmark = Rscratch2;
-
- ldr(Rmark, Address(Roop, oopDesc::mark_offset_in_bytes()));
- tst(Rmark, markWord::unlocked_value);
- b(fast_lock, ne);
-
- // Check for recursive lock
- // See comments in InterpreterMacroAssembler::lock_object for
- // explanations on the fast recursive locking check.
- // -1- test low 2 bits
- movs(Rscratch, AsmOperand(Rmark, lsl, 30));
- // -2- test (hdr - SP) if the low two bits are 0
- sub(Rscratch, Rmark, SP, eq);
- movs(Rscratch, AsmOperand(Rscratch, lsr, exact_log2(os::vm_page_size())), eq);
- // If still 'eq' then recursive locking OK
- // set to zero if recursive lock, set to non zero otherwise (see discussion in JDK-8153107)
- str(Rscratch, Address(Rbox, BasicLock::displaced_header_offset_in_bytes()));
- b(done);
-
- bind(fast_lock);
- str(Rmark, Address(Rbox, BasicLock::displaced_header_offset_in_bytes()));
-
- bool allow_fallthrough_on_failure = true;
- bool one_shot = true;
- cas_for_lock_acquire(Rmark, Rbox, Roop, Rscratch, done, allow_fallthrough_on_failure, one_shot);
- }
+ lightweight_lock(Roop /* obj */, Rbox /* t1 */, Rscratch /* t2 */, Rscratch2 /* t3 */,
+ 1 /* savemask (save t1) */, done);
 
+ cmp(Roop, Roop); // Success: set Z
  bind(done);
 
  // At this point flags are set as follows:
@@ -140,29 +107,12 @@ void C2_MacroAssembler::fast_unlock(Register Roop, Register Rbox, Register Rscra
 
  Label done;
 
- if (LockingMode == LM_LIGHTWEIGHT) {
-
- lightweight_unlock(Roop /* obj */, Rbox /* t1 */, Rscratch /* t2 */, Rscratch2 /* t3 */,
- 1 /* savemask (save t1) */, done);
-
- cmp(Roop, Roop); // Success: Set Z
- // Fall through
-
- } else if (LockingMode == LM_LEGACY) {
-
- Register Rmark = Rscratch2;
+ lightweight_unlock(Roop /* obj */, Rbox /* t1 */, Rscratch /* t2 */, Rscratch2 /* t3 */,
+ 1 /* savemask (save t1) */, done);
 
- // Find the lock address and load the displaced header from the stack.
- ldr(Rmark, Address(Rbox, BasicLock::displaced_header_offset_in_bytes()));
- // If hdr is null, we've got recursive locking and there's nothing more to do
- cmp(Rmark, 0);
- b(done, eq);
+ cmp(Roop, Roop); // Success: Set Z
+ // Fall through
 
- // Restore the object header
- bool allow_fallthrough_on_failure = true;
- bool one_shot = true;
- cas_for_lock_release(Rbox, Rmark, Roop, Rscratch, done, allow_fallthrough_on_failure, one_shot);
- }
  bind(done);
 
  // At this point flags are set as follows: