Merge branch 'lworld' into JDK-8377775

Author: dafedafe

make/autoconf/lib-tests.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 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
@@ -28,7 +28,7 @@
 ################################################################################
 
 # Minimum supported versions
-JTREG_MINIMUM_VERSION=8.1
+JTREG_MINIMUM_VERSION=8.2.1
 GTEST_MINIMUM_VERSION=1.14.0
 
 ################################################################################

make/conf/github-actions.conf

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 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
@@ -26,7 +26,7 @@
 # Versions and download locations for dependencies used by GitHub Actions (GHA)
 
 GTEST_VERSION=1.14.0
-JTREG_VERSION=8.1+1
+JTREG_VERSION=8.2.1+1
 
 LINUX_X64_BOOT_JDK_EXT=tar.gz
 LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk25/bd75d5f9689641da8e1daabeccb5528b/36/GPL/openjdk-25_linux-x64_bin.tar.gz

make/conf/jib-profiles.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -1174,9 +1174,9 @@ var getJibProfilesDependencies = function (input, common) {
         jtreg: {
             server: "jpg",
             product: "jtreg",
-            version: "8.1",
+            version: "8.2.1",
             build_number: "1",
-            file: "bundles/jtreg-8.1+1.zip",
+            file: "bundles/jtreg-8.2.1+1.zip",
             environment_name: "JT_HOME",
             environment_path: input.get("jtreg", "home_path") + "/bin",
             configure_args: "--with-jtreg=" + input.get("jtreg", "home_path"),

src/hotspot/share/cds/heapShared.cpp

@@ -1062,6 +1062,9 @@ void KlassSubGraphInfo::add_subgraph_object_klass(Klass* orig_k) {
       // to the list.
       return;
     }
+    if (orig_k->is_flatArray_klass()) {
+      _subgraph_object_klasses->append_if_missing(FlatArrayKlass::cast(orig_k)->element_klass());
+    }
   } else {
     assert(orig_k->is_typeArray_klass(), "must be");
     // Primitive type arrays are created early during Universe::genesis.
@@ -1498,11 +1501,24 @@ HeapShared::resolve_or_init_classes_for_subgraph_of(Klass* k, bool do_init, TRAP
       log_info(aot, heap)("%s subgraph %s ", do_init ? "init" : "resolve", k->external_name());
     }
 
+    Array<Klass*>* klasses = record->subgraph_object_klasses();
+
+    if (do_init && klasses != nullptr) {
+      // All the classes of the oops in this subgraph are in the klasses array.
+      // Link them first in case any of the oops are used in the <clinit> methods
+      // invoked in the rest of this function.
+      for (int i = 0; i < klasses->length(); i++) {
+        Klass* klass = klasses->at(i);
+        if (klass->in_aot_cache() && klass->is_instance_klass()) {
+          InstanceKlass::cast(klass)->link_class(CHECK_NULL);
+        }
+      }
+    }
+
     resolve_or_init(k, do_init, CHECK_NULL);
 
     // Load/link/initialize the klasses of the objects in the subgraph.
     // nullptr class loader is used.
-    Array<Klass*>* klasses = record->subgraph_object_klasses();
     if (klasses != nullptr) {
       for (int i = 0; i < klasses->length(); i++) {
         Klass* klass = klasses->at(i);

src/hotspot/share/ci/ciConstant.cpp

@@ -31,6 +31,26 @@
 //
 // This class represents a constant value.
 
+ciConstant ciConstant::make_zero_or_null(BasicType bt) {
+  switch (bt) {
+  case T_FLOAT: return ciConstant((jfloat).0f);
+  case T_DOUBLE: return ciConstant((jdouble).0);
+  case T_LONG: return ciConstant((jlong)0L);
+  case T_BOOLEAN:
+  case T_CHAR:
+  case T_BYTE:
+  case T_SHORT:
+  case T_INT:
+    return ciConstant(bt, 0);
+  case T_OBJECT:
+  case T_ARRAY:
+    return ciConstant(bt, CURRENT_ENV->get_object(nullptr));
+  default:
+    ShouldNotReachHere();
+    return ciConstant();
+  }
+}
+
 // ------------------------------------------------------------------
 // ciConstant::is_null_or_zero
 // This assumes `this->is_valid()`, otherwise, `as_object` will assert.

src/hotspot/share/ci/ciConstant.hpp

@@ -109,6 +109,7 @@ class ciConstant {
     return _value._object;
   }
 
+  static ciConstant make_zero_or_null(BasicType);
   bool is_null_or_zero() const;
 
   bool is_valid() const {

src/hotspot/share/ci/ciField.cpp

@@ -369,7 +369,7 @@ ciConstant ciField::constant_value() {
   if (_constant_value.basic_type() == T_ILLEGAL) {
     // Static fields are placed in mirror objects.
     ciInstance* mirror = _holder->java_mirror();
-    _constant_value = mirror->field_value_impl(type()->basic_type(), offset_in_bytes());
+    _constant_value = mirror->field_value_impl(this);
   }
   if (FoldStableValues && is_stable() && _constant_value.is_null_or_zero()) {
     return ciConstant();

src/hotspot/share/ci/ciField.hpp

@@ -99,6 +99,7 @@ class ciField : public ArenaObj {
   //   In that case the declared holder of f would be B and
   //   the canonical holder of f would be A.
   ciInstanceKlass* holder() const { return _holder; }
+  ciInstanceKlass* original_holder() const { return _original_holder; }
 
   // Name of this field?
   ciSymbol* name() const { return _name; }
@@ -112,9 +113,6 @@ class ciField : public ArenaObj {
   // How is this field actually stored in memory?
   BasicType layout_type() { return type2field[(_type == nullptr) ? T_OBJECT : _type->basic_type()]; }
 
-  // How big is this field in memory?
-  int size_in_bytes() { return type2aelembytes(layout_type()); }
-
   // What is the offset of this field? (Fields are aligned to the byte level.)
   int offset_in_bytes() const {
     assert(_offset >= 1, "illegal call to offset()");
@@ -181,6 +179,7 @@ class ciField : public ArenaObj {
   bool is_flat                 () const { return _is_flat; }
   bool is_null_free            () const { return _is_null_free; }
   int null_marker_offset       () const { return _null_marker_offset; }
+  LayoutKind layout_kind       () const { return _layout_kind; }
 
   // Whether this field needs to act atomically. Note that it does not actually need accessing
   // atomically. For example, if there cannot be racy accesses to this field, then it can be

src/hotspot/share/ci/ciFlatArray.cpp

@@ -30,53 +30,12 @@
 #include "ci/ciUtilities.inline.hpp"
 #include "oops/oop.inline.hpp"
 
-ciConstant ciFlatArray::null_marker_of_element_by_offset_impl(arrayOop ary, int index) {
-  if (ary == nullptr) {
-    return ciConstant();
-  }
-  assert(ary->is_array(), "");
-  if (index < 0 || index >= ary->length()) {
-    return ciConstant();
-  }
-    assert(ary->is_objArray(), "");
-    flatArrayOop objary = (flatArrayOop) ary;
-    jboolean elem = objary->null_marker_of_obj_at(index);
-    return ciConstant(T_BOOLEAN, elem);
-}
-
-ciConstant ciFlatArray::check_constant_null_marker_cache(int off) {
-  if (_constant_null_markers != nullptr) {
-    for (int i = 0; i < _constant_null_markers->length(); ++i) {
-      ConstantValue cached_val = _constant_null_markers->at(i);
-      if (cached_val.off() == off) {
-        return cached_val.value();
-      }
-    }
-  }
-  return ciConstant();
-}
-
-void ciFlatArray::add_to_constant_null_marker_cache(int off, ciConstant val) {
-  assert(val.is_valid(), "value must be valid");
-  assert(!check_constant_value_cache(off, val.basic_type()).is_valid(), "duplicate");
-  if (_constant_null_markers == nullptr) {
-    Arena* arena = CURRENT_ENV->arena();
-    _constant_null_markers = new (arena) GrowableArray<ConstantValue>(arena, 1, 0, ConstantValue());
-  }
-  _constant_null_markers->append(ConstantValue(off, val));
-}
-
 // Current value of an element.
 // Returns T_ILLEGAL if there is no element at the given index.
 ciConstant ciFlatArray::null_marker_of_element_by_index(int index) {
-  ciConstant value = check_constant_null_marker_cache(index);
-  if (value.is_valid()) {
-    return value;
-  }
-  GUARDED_VM_ENTRY(
-      value = null_marker_of_element_by_offset_impl(get_arrayOop(), index);)
-  add_to_constant_null_marker_cache(index, value);
-  return value;
+  ciConstant nm = field_value(index, nullptr);
+  postcond(!nm.is_valid() || nm.basic_type() == T_BOOLEAN);
+  return nm;
 }
 
 ciConstant ciFlatArray::null_marker_of_element_by_offset(intptr_t element_offset) {
@@ -133,23 +92,36 @@ ciConstant ciFlatArray::field_value_by_offset(intptr_t field_offset) {
 }
 
 ciConstant ciFlatArray::field_value(int index, ciField* field) {
+  auto get_field_from_object_constant = [field](const ciConstant& v) -> ciConstant {
+    ciObject* obj = v.as_object();
+    if (obj->is_null_object()) {
+      if (field == nullptr) {
+        return ciConstant::make_zero_or_null(T_BOOLEAN);
+      }
+      return ciConstant::make_zero_or_null(field->type()->basic_type());
+    }
+    // obj cannot be an ciArray since it is an element of a flat array, so it must be a value class, which arrays are not.
+    ciInstance* inst = obj->as_instance();
+    if (field == nullptr) {
+      return ciConstant(T_BOOLEAN, 1);
+    }
+    return inst->field_value(field);
+  };
+
   BasicType elembt = element_basic_type();
   ciConstant value = check_constant_value_cache(index, elembt);
   if (value.is_valid()) {
-    if (field == nullptr) {
-      return value.as_object()->as_instance()->null_marker_value();
-    }
-    return value.as_object()->as_instance()->field_value(field);
+    return get_field_from_object_constant(value);
   }
   GUARDED_VM_ENTRY(
     value = element_value_impl(T_OBJECT, get_arrayOop(), index);
   )
 
-  add_to_constant_value_cache(index, value);
-
-  if (field == nullptr) {
-    return value.as_object()->as_instance()->null_marker_value();
+  if (!value.is_valid()) {
+    return ciConstant();
   }
-  return value.as_object()->as_instance()->field_value(field);
+
+  add_to_constant_value_cache(index, value);
+  return get_field_from_object_constant(value);
 }
 

src/hotspot/share/ci/ciFlatArray.hpp

@@ -51,13 +51,6 @@ class ciFlatArray : public ciArray {
   ciConstant field_value(int index, ciField* field);
   ciConstant null_marker_of_element_by_offset(intptr_t element_offset);
   ciConstant null_marker_of_element_by_index(int index);
-
-private:
-  ciConstant null_marker_of_element_by_offset_impl(arrayOop ary, int index);
-  ciConstant check_constant_null_marker_cache(int off);
-  void add_to_constant_null_marker_cache(int off, ciConstant val);
-
-  GrowableArray<ConstantValue>* _constant_null_markers = nullptr;
 };
 
 #endif // SHARE_VM_CI_CIFLATARRAY_HPP