Merge lworld

Author: Vicente Romero

make/CompileJavaModules.gmk

@@ -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
@@ -140,25 +140,20 @@ VALUECLASSES_STR := valueclasses
 ifneq ($(COMPILER), bootjdk)
   MODULE_VALUECLASS_SRC_DIRS := $(call FindModuleValueClassSrcDirs, $(MODULE))
   MODULE_VALUECLASS_SOURCEPATH := $(call GetModuleValueClassSrcPath)
-
-  # Temporarily compile valueclasses into a separate directory with the form:
-  #   <tempdir>/<module>/<classpath>
-  # and then copy the class files into:
-  #   <outdir>/<module>/META-INF/preview/<classpath>
-  # We cannot compile directly into the desired directory because it's the
-  # compiler which creates the original '<module>/<classpath>/...' hierarchy.
-  VALUECLASS_OUTPUTDIR := $(SUPPORT_OUTPUTDIR)/$(VALUECLASSES_STR)
-  PREVIEW_OUTPUTDIR := $(COMPILATION_OUTPUTDIR)/$(MODULE)/META-INF/preview
-
   ifneq ($(MODULE_VALUECLASS_SRC_DIRS),)
+    # Temporarily compile valueclasses into a separate directory, and then copy
+    # into the correct "META-INF/preview" path location.
+    # We cannot compile directly into the desired directory because it's the
+    # compiler which creates the original '<module>/<classpath>/...' hierarchy.
+    TEMP_OUTPUTDIR := $(SUPPORT_OUTPUTDIR)/$(VALUECLASSES_STR)
+
     $(eval $(call SetupJavaCompilation, $(MODULE)-$(VALUECLASSES_STR), \
         SMALL_JAVA := false, \
         MODULE := $(MODULE), \
         SRC := $(wildcard $(MODULE_VALUECLASS_SRC_DIRS)), \
         INCLUDES := $(JDK_USER_DEFINED_FILTER), \
         FAIL_NO_SRC := $(FAIL_NO_SRC), \
-        BIN := $(VALUECLASS_OUTPUTDIR)/, \
-        JAR := $(JDK_OUTPUTDIR)/lib/$(VALUECLASSES_STR)/$(MODULE)-$(VALUECLASSES_STR).jar, \
+        BIN := $(TEMP_OUTPUTDIR)/, \
         HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \
         DISABLED_WARNINGS := $(DISABLED_WARNINGS_java) preview, \
         EXCLUDES := $(EXCLUDES), \
@@ -173,27 +168,24 @@ ifneq ($(COMPILER), bootjdk)
             --enable-preview -source $(JDK_SOURCE_TARGET_VERSION), \
     ))
 
-    TARGETS += $($(MODULE)-$(VALUECLASSES_STR))
-
-    # Restructure the value class hierarchy from "<module>/<classpath>/..."
-    # to "<module>/META-INF/preview/<classpath>/..."
-    # When module patching is removed, this could probably be a move rather than a copy.
-
-    # FIXME: The marker file should probably go in modules root dir.
-    # FIXME: Copying value classes should not also copy marker files.
-    $(PREVIEW_OUTPUTDIR)/_the.copy_valueclasses.marker: $($(MODULE)-$(VALUECLASSES_STR))
-		$(call MakeTargetDir)
-		$(CP) -R $(VALUECLASS_OUTPUTDIR)/$(MODULE)/. $(@D)/
+    # Don't add '$($(MODULE)-$(VALUECLASSES_STR))' to TARGETS (it's transient).
+    # The 'valueclasses' target below depends on it, and that's the non-transient
+    # result we care about.
+
+    # Copy compiled output from "$TEMP_OUTPUTDIR/$MODULE/<classpath>/..."
+    # to "$COMPILATION_OUTPUTDIR/$MODULE/META-INF/preview/<classpath>/...".
+    MOD_SRC := $(TEMP_OUTPUTDIR)/$(MODULE)
+    MOD_DST := $(COMPILATION_OUTPUTDIR)/$(MODULE)
+
+    # NOTE: We cannot use '$(CP) -R $(MOD_SRC)/*/ ...' to select sub-directories (it
+    # does not work on MacOS/BSD). Use 'filter-out' to explicitly exclude marker files.
+    $(MOD_DST)/_the.$(MODULE).valueclasses: $($(MODULE)-$(VALUECLASSES_STR))
+		$(RM) -r $(@D)/META-INF/preview
+		$(MKDIR) -p $(@D)/META-INF/preview
+		$(CP) -R $(filter-out $(MOD_SRC)/_%, $(wildcard $(MOD_SRC)/*)) $(@D)/META-INF/preview
 		$(TOUCH) $@
 
-    TARGETS += $(PREVIEW_OUTPUTDIR)/_the.copy_valueclasses.marker
-
-    $(eval $(call SetupCopyFiles, $(MODULE)-copy-valueclass-jar, \
-        FILES := $(JDK_OUTPUTDIR)/lib/$(VALUECLASSES_STR)/$(MODULE)-$(VALUECLASSES_STR).jar, \
-        DEST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/$(VALUECLASSES_STR), \
-    ))
-
-    TARGETS += $($(MODULE)-copy-valueclass-jar)
+    TARGETS += $(MOD_DST)/_the.$(MODULE).valueclasses
   endif
 endif
 

src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp

@@ -7261,17 +7261,17 @@ bool MacroAssembler::unpack_inline_helper(const GrowableArray<SigEntry>* sig, in
       b(L_notNull);
       bind(L_null);
       // Set null marker to zero to signal that the argument is null.
-      // Also set all oop fields to zero to make the GC happy.
+      // Also set all fields to zero since the runtime requires a canonical
+      // representation of a flat null.
       stream.reset(sig_index, to_index);
       while (stream.next(toReg, bt)) {
-        if (sig->at(stream.sig_index())._offset == -1 ||
-            bt == T_OBJECT || bt == T_ARRAY) {
-          if (toReg->is_stack()) {
-            int st_off = toReg->reg2stack() * VMRegImpl::stack_slot_size;
-            str(zr, Address(sp, st_off));
-          } else {
-            mov(toReg->as_Register(), zr);
-          }
+        if (toReg->is_stack()) {
+          int st_off = toReg->reg2stack() * VMRegImpl::stack_slot_size;
+          str(zr, Address(sp, st_off));
+        } else if (toReg->is_FloatRegister()) {
+          mov(toReg->as_FloatRegister(), T2S, 0);
+        } else {
+          mov(toReg->as_Register(), zr);
         }
       }
       bind(L_notNull);

src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp

@@ -3055,7 +3055,7 @@ BufferedInlineTypeBlob* SharedRuntime::generate_buffered_inline_type_adapter(con
     j++;
   }
   assert(j == regs->length(), "missed a field?");
-  if (vk->has_nullable_atomic_layout()) {
+  if (vk->supports_nullable_layouts()) {
     // Zero the null marker (setting it to 1 would be better but would require an additional register)
     __ strb(zr, Address(r0, vk->null_marker_offset()));
   }
@@ -3067,7 +3067,8 @@ BufferedInlineTypeBlob* SharedRuntime::generate_buffered_inline_type_adapter(con
   Label not_null;
   __ cbnz(r0, not_null);
 
-  // Return value is null. Zero oop registers to make the GC happy.
+  // Return value is null. Zero all registers because the runtime requires a canonical
+  // representation of a flat null.
   j = 1;
   for (int i = 0; i < sig_vk->length(); i++) {
     BasicType bt = sig_vk->at(i)._bt;
@@ -3081,9 +3082,12 @@ BufferedInlineTypeBlob* SharedRuntime::generate_buffered_inline_type_adapter(con
       }
       continue;
     }
-    if (bt == T_OBJECT || bt == T_ARRAY) {
-      VMRegPair pair = regs->at(j);
-      VMReg r_1 = pair.first();
+
+    VMRegPair pair = regs->at(j);
+    VMReg r_1 = pair.first();
+    if (r_1->is_FloatRegister()) {
+      __ mov(r_1->as_FloatRegister(), Assembler::T2S, 0);
+    } else {
       __ mov(r_1->as_Register(), zr);
     }
     j++;

src/hotspot/cpu/x86/macroAssembler_x86.cpp

@@ -6380,17 +6380,17 @@ bool MacroAssembler::unpack_inline_helper(const GrowableArray<SigEntry>* sig, in
       jmp(L_notNull);
       bind(L_null);
       // Set null marker to zero to signal that the argument is null.
-      // Also set all oop fields to zero to make the GC happy.
+      // Also set all fields to zero since the runtime requires a canonical
+      // representation of a flat null.
       stream.reset(sig_index, to_index);
       while (stream.next(toReg, bt)) {
-        if (sig->at(stream.sig_index())._offset == -1 ||
-            bt == T_OBJECT || bt == T_ARRAY) {
-          if (toReg->is_stack()) {
-            int st_off = toReg->reg2stack() * VMRegImpl::stack_slot_size + wordSize;
-            movq(Address(rsp, st_off), 0);
-          } else {
-            xorq(toReg->as_Register(), toReg->as_Register());
-          }
+        if (toReg->is_stack()) {
+          int st_off = toReg->reg2stack() * VMRegImpl::stack_slot_size + wordSize;
+          movq(Address(rsp, st_off), 0);
+        } else if (toReg->is_XMMRegister()) {
+          xorps(toReg->as_XMMRegister(), toReg->as_XMMRegister());
+        } else {
+          xorl(toReg->as_Register(), toReg->as_Register());
         }
       }
       bind(L_notNull);

src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp

@@ -3848,7 +3848,7 @@ BufferedInlineTypeBlob* SharedRuntime::generate_buffered_inline_type_adapter(con
     j++;
   }
   assert(j == regs->length(), "missed a field?");
-  if (vk->has_nullable_atomic_layout()) {
+  if (vk->supports_nullable_layouts()) {
     // Set the null marker
     __ movb(Address(rax, vk->null_marker_offset()), 1);
   }
@@ -3861,7 +3861,8 @@ BufferedInlineTypeBlob* SharedRuntime::generate_buffered_inline_type_adapter(con
   __ testptr(rax, rax);
   __ jcc(Assembler::notZero, not_null);
 
-  // Return value is null. Zero oop registers to make the GC happy.
+  // Return value is null. Zero all registers because the runtime requires a canonical
+  // representation of a flat null.
   j = 1;
   for (int i = 0; i < sig_vk->length(); i++) {
     BasicType bt = sig_vk->at(i)._bt;
@@ -3875,10 +3876,13 @@ BufferedInlineTypeBlob* SharedRuntime::generate_buffered_inline_type_adapter(con
       }
       continue;
     }
-    if (bt == T_OBJECT || bt == T_ARRAY) {
-      VMRegPair pair = regs->at(j);
-      VMReg r_1 = pair.first();
-      __ xorq(r_1->as_Register(), r_1->as_Register());
+
+    VMRegPair pair = regs->at(j);
+    VMReg r_1 = pair.first();
+    if (r_1->is_XMMRegister()) {
+      __ xorps(r_1->as_XMMRegister(), r_1->as_XMMRegister());
+    } else {
+      __ xorl(r_1->as_Register(), r_1->as_Register());
     }
     j++;
   }

src/hotspot/share/c1/c1_Canonicalizer.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -468,11 +468,8 @@ void Canonicalizer::do_CompareOp      (CompareOp*       x) {
 
 
 void Canonicalizer::do_IfOp(IfOp* x) {
-  // Currently, Canonicalizer is only used by GraphBuilder,
-  // and IfOp is not created by GraphBuilder but only later
-  // when eliminating conditional expressions with CE_Eliminator,
-  // so this method will not be called.
-  ShouldNotReachHere();
+  // Currently, Canonicalizer is only used by GraphBuilder, and IfOp is only created by
+  // GraphBuilder when loading/storing flat fields, do nothing for now.
 }