8370886: [lworld] 8369296 partially reverted for resolving static get/put field

Reviewed-by: matsaave

Author: coleenp

src/hotspot/share/interpreter/interpreterRuntime.cpp

@@ -781,13 +781,7 @@ void InterpreterRuntime::resolve_get_put(Bytecodes::Code bytecode, int field_ind
 
   Bytecodes::Code get_code = (Bytecodes::Code)0;
   Bytecodes::Code put_code = (Bytecodes::Code)0;
-  if (!uninitialized_static) {
-    get_code = ((is_static) ? Bytecodes::_getstatic : Bytecodes::_getfield);
-    if ((is_put && !has_initialized_final_update) || !info.access_flags().is_final()) {
-      put_code = ((is_static) ? Bytecodes::_putstatic : Bytecodes::_putfield);
-    }
-    assert(!info.is_strict_static_unset(), "after initialization, no unset flags");
-  } else if (is_static && (info.is_strict_static_unset() || strict_static_final)) {
+  if (uninitialized_static && (info.is_strict_static_unset() || strict_static_final)) {
     // During <clinit>, closely track the state of strict statics.
     // 1. if we are reading an uninitialized strict static, throw
     // 2. if we are writing one, clear the "unset" flag
@@ -799,6 +793,12 @@ void InterpreterRuntime::resolve_get_put(Bytecodes::Code bytecode, int field_ind
     assert(klass->is_reentrant_initialization(THREAD),
       "<clinit> must be running in current thread");
     klass->notify_strict_static_access(info.index(), is_put, CHECK);
+    assert(!info.is_strict_static_unset(), "after initialization, no unset flags");
+  } else if (!uninitialized_static || VM_Version::supports_fast_class_init_checks()) {
+    get_code = ((is_static) ? Bytecodes::_getstatic : Bytecodes::_getfield);
+    if ((is_put && !has_initialized_final_update) || !info.access_flags().is_final()) {
+      put_code = ((is_static) ? Bytecodes::_putstatic : Bytecodes::_putfield);
+    }
   }
 
   ResolvedFieldEntry* entry = pool->resolved_field_entry_at(field_index);