Merge to tag jdk-28+15

make/conf/docs-modules.conf

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2026, 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
@@ -41,6 +41,7 @@ DOCS_MODULES= \
     jdk.hotspot.agent \
     jdk.httpserver \
     jdk.jpackage \
+    jdk.incubator.json \
     jdk.incubator.vector \
     jdk.jartool \
     jdk.javadoc \

make/modules/java.base/lib/CoreLibraries.gmk

@@ -176,7 +176,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \
     EXTRA_HEADER_DIRS := libjvm, \
     OPTIMIZATION := HIGH, \
     CFLAGS := $(LIBJLI_CFLAGS) $(LIBZ_CFLAGS), \
-    DISABLED_WARNINGS_gcc := unused-function unused-variable, \
+    DISABLED_WARNINGS_gcc := unused-function, \
     DISABLED_WARNINGS_clang := deprecated-non-prototype format-nonliteral \
         unused-function, \
     DISABLED_WARNINGS_clang_java_md_macosx.m := unused-variable, \

src/hotspot/cpu/aarch64/aarch64.ad

@@ -2191,7 +2191,7 @@ void MachVEPNode::format(PhaseRegAlloc* ra_, outputStream* st) const
   if (!_verified) {
     st->print_cr("\t load_class");
   } else {
-    st->print_cr("\t unpack_inline_arg");
+    st->print_cr("\t unpack_value_arg");
   }
 }
 #endif
@@ -2209,9 +2209,9 @@ void MachVEPNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc* ra_) const
       int framesize = ra_->C->output()->frame_slots() << LogBytesPerInt;
       __ remove_frame(framesize, false);
     }
-    // Unpack inline type args passed as oop and then jump to
+    // Unpack value type args passed as oop and then jump to
     // the verified entry point (skipping the unverified entry).
-    int sp_inc = __ unpack_inline_args(ra_->C, _receiver_only);
+    int sp_inc = __ unpack_value_args(ra_->C, _receiver_only);
     // Emit code for verified entry and save increment for stack repair on return
     __ verified_entry(ra_->C, sp_inc);
     if (Compile::current()->output()->in_scratch_emit_size()) {
@@ -3683,7 +3683,7 @@ encode %{
       // Check that stack depth is unchanged: find majik cookie on stack
       __ call_Unimplemented();
     }
-    if (tf()->returns_inline_type_as_fields() && !_method->is_method_handle_intrinsic() && _method->return_type()->is_loaded()) {
+    if (tf()->returns_value_type_as_fields() && !_method->is_method_handle_intrinsic() && _method->return_type()->is_loaded()) {
       // The last return value is not set by the callee but used to pass the null marker to compiled code.
       // Search for the corresponding projection, get the register and emit code that initializes it.
       uint con = (tf()->range_cc()->cnt() - 1);
@@ -3704,9 +3704,9 @@ encode %{
         }
       }
       if (return_value_is_used()) {
-        // An inline type is returned as fields in multiple registers.
-        // R0 either contains an oop if the inline type is buffered or a pointer
-        // to the corresponding InlineKlass with the lowest bit set to 1. Zero r0
+        // A value type is returned as fields in multiple registers.
+        // R0 either contains an oop if the value type is buffered or a pointer
+        // to the corresponding ValueKlass with the lowest bit set to 1. Zero r0
         // if the lowest bit is set to allow C2 to use the oop after null checking.
         // r0 &= (r0 & 1) - 1
         __ andr(rscratch1, r0, 0x1);
@@ -3856,15 +3856,9 @@ frame %{
   // return address specifies a type (REG or STACK) and a number
   // representing the register number (i.e. - use a register name) or
   // stack slot.
-  // Ret Addr is on stack in slot 0 if no locks or verification or alignment.
-  // Otherwise, it is above the locks and verification slot and alignment word
-  // TODO this may well be correct but need to check why that - 2 is there
-  // ppc port uses 0 but we definitely need to allow for fixed_slots
-  // which folds in the space used for monitors
-  return_addr(STACK - 2 +
-              align_up((Compile::current()->in_preserve_stack_slots() +
-                        Compile::current()->fixed_slots()),
-                       stack_alignment_in_slots()));
+  // Ret Addr is on stack 2 slots below _old_SP, i.e. in slot 0 if no locks
+  // or verification or alignment.
+  return_addr(STACK OptoReg::reg2stack(_old_SP) - 2);
 
   // Location of compiled Java return values.  Same as C for now.
   return_value