Regressions fixes

jatin-bhateja · Sep 4, 2024 · 407b160 · 407b160
1 parent fa94918
commit 407b160
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 46 deletions.
diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
@@ -6405,6 +6405,7 @@ void ClassFileParser::post_process_parsed_stream(const ClassFileStream* const st
     }
     if (_parsed_annotations->has_annotation(ClassAnnotationCollector::_jdk_internal_NullRestrictedArray)) {
       _has_null_restricted_array = true;
+      _is_implicitly_constructible = _parsed_annotations->has_annotation(ClassAnnotationCollector::_jdk_internal_ImplicitlyConstructible);
     }
     // Implicit constructibility and null restriction are sufficient to guarantee atomic updates to value based boxed primitives.
     if (_parsed_annotations->has_annotation(ClassAnnotationCollector::_jdk_internal_ValueBased) && _has_null_restricted_array && _is_implicitly_constructible) {

diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp
@@ -382,8 +382,7 @@ JRT_ENTRY(void, InterpreterRuntime::anewarray(JavaThread* current, ConstantPool*
   Klass*    klass = pool->klass_at(index, CHECK);
   bool has_flat_layout = klass->is_inline_klass() &&
     InstanceKlass::cast(klass)->is_implicitly_constructible() &&
-    InstanceKlass::cast(klass)->has_null_restricted_array() &&
-    !InstanceKlass::cast(klass)->must_be_atomic();
+    InstanceKlass::cast(klass)->has_null_restricted_array();
   if (has_flat_layout) {
     obj = oopFactory::new_valueArray(klass, size, CHECK);
   } else {

diff --git a/test/jdk/java/foreign/enablenativeaccess/org/openjdk/foreigntest/libLinkerInvokerUnnamed.cpp b/test/jdk/java/foreign/enablenativeaccess/org/openjdk/foreigntest/libLinkerInvokerUnnamed.cpp