Reapply "[vm] Add graph intrinsics for ThreadLocal hasValue and getValue methods."

This reverts commit 4d7467a.

The fix for the failure that caused revert is in patchset 2.

TEST=ci
Change-Id: I9b7ff0dd049062b086ad43c8368c6ede130edf35
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/465781
Commit-Queue: Alexander Aprelev <[email protected]>
Reviewed-by: Slava Egorov <[email protected]>

Author: aam

runtime/lib/isolate.cc

@@ -1279,79 +1279,70 @@ DEFINE_NATIVE_ENTRY(Isolate_sendOOB, 0, 2) {
 }
 
 static void EnsureThreadLocalsTableExistsAndBigEnough(Thread* thread,
-                                                      intptr_t index) {
-  GrowableObjectArray& locals =
-      GrowableObjectArray::Handle(thread->thread_locals());
-  if (locals.IsNull()) {
-    locals = GrowableObjectArray::New();
-    thread->set_thread_locals(locals);
-  }
-  if (index >= locals.Length()) {
-    locals.Grow(index + 1);
-    intptr_t old_length = locals.Length();
-    locals.SetLength(locals.Capacity());
-    for (intptr_t i = old_length; i < locals.Capacity(); i++) {
-      locals.SetAt(i, Object::sentinel());
+                                                      intptr_t id) {
+  Array& locals = Array::Handle(thread->thread_locals());
+  if (id >= locals.Length()) {
+    intptr_t new_length = id + 1;
+    const Array& new_array =
+        Array::Handle(Array::Grow(locals, new_length, Heap::kOld));
+    for (intptr_t i = locals.Length(); i < new_length; i++) {
+      new_array.SetAt(i, Object::sentinel());
     }
+    thread->set_thread_locals(new_array);
   }
 }
 
-DEFINE_NATIVE_ENTRY(ScopedThreadLocal_allocateId, 0, 0) {
+DEFINE_NATIVE_ENTRY(ThreadLocal_allocateId, 0, 0) {
   auto isolate_group = thread->isolate_group();
-  isolate_group->increment_scoped_thread_locals_count();
-  intptr_t new_index = isolate_group->scoped_thread_locals_count() - 1;
+  isolate_group->increment_thread_locals_count();
+  intptr_t new_index = isolate_group->thread_locals_count() - 1;
   EnsureThreadLocalsTableExistsAndBigEnough(thread, new_index);
-  GrowableObjectArray& locals =
-      GrowableObjectArray::Handle(thread->thread_locals());
+  Array& locals = Array::Handle(thread->thread_locals());
   locals.SetAt(new_index, Object::sentinel());
   return Integer::New(new_index);
 }
 
 static void ValidateScopedThreadLocalId(Thread* thread, intptr_t id) {
-  if (id < 0 || id >= thread->isolate_group()->scoped_thread_locals_count()) {
+  if (id < 0 || id >= thread->isolate_group()->thread_locals_count()) {
     const String& msg = String::Handle(String::New("Invalid local id."));
     Exceptions::ThrowStateError(msg);
     UNREACHABLE();
   }
   EnsureThreadLocalsTableExistsAndBigEnough(thread, id);
 }
 
-DEFINE_NATIVE_ENTRY(ScopedThreadLocal_hasValue, 0, 1) {
+DEFINE_NATIVE_ENTRY(ThreadLocal_hasValue, 0, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(Integer, id_obj, arguments->NativeArgAt(0));
   intptr_t id = id_obj.Value();
   ValidateScopedThreadLocalId(thread, id);
-  GrowableObjectArray& locals =
-      GrowableObjectArray::Handle(thread->thread_locals());
+  Array& locals = Array::Handle(thread->thread_locals());
   return locals.At(id) == Object::sentinel().ptr() ? Bool::False().ptr()
                                                    : Bool::True().ptr();
 }
 
-DEFINE_NATIVE_ENTRY(ScopedThreadLocal_getValue, 0, 1) {
+DEFINE_NATIVE_ENTRY(ThreadLocal_getValue, 0, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(Integer, id_obj, arguments->NativeArgAt(0));
   intptr_t id = id_obj.Value();
   ValidateScopedThreadLocalId(thread, id);
-  GrowableObjectArray& locals =
-      GrowableObjectArray::Handle(thread->thread_locals());
+  Array& locals = Array::Handle(thread->thread_locals());
   return locals.At(id);
 }
 
-DEFINE_NATIVE_ENTRY(ScopedThreadLocal_setValue, 0, 2) {
+DEFINE_NATIVE_ENTRY(ThreadLocal_setValue, 0, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(Integer, id_obj, arguments->NativeArgAt(0));
   intptr_t id = id_obj.Value();
   ValidateScopedThreadLocalId(thread, id);
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, value, arguments->NativeArgAt(1));
-  GrowableObjectArray& locals =
-      GrowableObjectArray::Handle(thread->thread_locals());
+  Array& locals = Array::Handle(thread->thread_locals());
   locals.SetAt(id, value);
   return Object::null();
 }
 
-DEFINE_NATIVE_ENTRY(ScopedThreadLocal_clearValue, 0, 1) {
+DEFINE_NATIVE_ENTRY(ThreadLocal_clearValue, 0, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(Integer, id_obj, arguments->NativeArgAt(0));
   intptr_t id = id_obj.Value();
   ValidateScopedThreadLocalId(thread, id);
-  GrowableObjectArray& locals =
-      GrowableObjectArray::Handle(thread->thread_locals());
+  Array& locals = Array::Handle(thread->thread_locals());
   locals.SetAt(id, Object::sentinel());
   return Object::null();
 }

runtime/vm/bootstrap_natives.h

@@ -281,11 +281,11 @@ namespace dart {
   V(Internal_allocateObjectInstructionsEnd, 0)                                 \
   V(InvocationMirror_unpackTypeArguments, 2)                                   \
   V(NoSuchMethodError_existingMethodSignature, 3)                              \
-  V(ScopedThreadLocal_allocateId, 0)                                           \
-  V(ScopedThreadLocal_clearValue, 1)                                           \
-  V(ScopedThreadLocal_getValue, 1)                                             \
-  V(ScopedThreadLocal_hasValue, 1)                                             \
-  V(ScopedThreadLocal_setValue, 2)                                             \
+  V(ThreadLocal_allocateId, 0)                                                 \
+  V(ThreadLocal_clearValue, 1)                                                 \
+  V(ThreadLocal_getValue, 1)                                                   \
+  V(ThreadLocal_hasValue, 1)                                                   \
+  V(ThreadLocal_setValue, 2)                                                   \
   V(Uri_isWindowsPlatform, 0)                                                  \
   V(UserTag_new, 2)                                                            \
   V(UserTag_label, 1)                                                          \

runtime/vm/compiler/backend/il.h

@@ -10763,7 +10763,7 @@ class GenericCheckBoundInstr : public CheckBoundBaseInstr {
 
     // Phantom checks serve as dependencies inhibiting illegal code motion but
     // are removed before code generation. Phantom checks are inserted due to
-    // unsafe annotations. An early-phaee path-sensitive bounds check removal
+    // unsafe annotations. An early-phase path-sensitive bounds check removal
     // optimization can be implemented by replacing a real check with a phantom
     // check.
     kPhantom

runtime/vm/compiler/backend/slot.h

@@ -233,7 +233,8 @@ class ParsedFunction;
   V(ObjectStore, _, record_field_names, Array, VAR)                            \
   V(PersistentHandle, _, ptr, Dynamic, VAR)                                    \
   V(Thread, _, current_tag, UserTag, VAR)                                      \
-  V(Thread, _, default_tag, UserTag, VAR)
+  V(Thread, _, default_tag, UserTag, VAR)                                      \
+  V(Thread, _, thread_locals, Array, VAR)
 
 // List of slots that correspond to fields of non-Dart objects containing
 // unboxed values in the following format:

runtime/vm/compiler/graph_intrinsifier.cc

@@ -721,5 +721,54 @@ bool GraphIntrinsifier::Build_DoubleFlipSignBit(FlowGraph* flow_graph) {
   return true;
 }
 
+static Definition* GetThreadLocalValue(FlowGraph* flow_graph,
+                                       BlockBuilder* builder) {
+  Definition* thread = builder->AddDefinition(new LoadThreadInstr());
+  Definition* array = builder->AddDefinition(
+      new LoadFieldInstr(new Value(thread),
+                         /*slot=*/Slot::Thread_thread_locals(),
+                         InnerPointerAccess::kNotUntagged, builder->Source(),
+                         /*calls_initializer=*/false, DeoptId::kNone,
+                         compiler::Assembler::kRelaxedNonAtomic));
+  Definition* index = builder->AddParameter(0);
+
+  Definition* safe_index =
+      PrepareIndexedOp(flow_graph, builder, array, index, Slot::Array_length());
+
+  Definition* local = builder->AddDefinition(new LoadIndexedInstr(
+      new Value(array), new Value(safe_index), /*index_unboxed=*/false,
+      /*index_scale=*/target::Instance::ElementSizeFor(kArrayCid), kArrayCid,
+      kAlignedAccess, DeoptId::kNone, builder->Source(),
+      new CompileType(CompileType::FromAbstractType(
+          Type::ZoneHandle(Type::ObjectType()), CompileType::kCanBeNull,
+          CompileType::kCanBeSentinel))));
+  return local;
+}
+
+bool GraphIntrinsifier::Build_ThreadLocalGetValue(FlowGraph* flow_graph) {
+  GraphEntryInstr* graph_entry = flow_graph->graph_entry();
+  auto normal_entry = graph_entry->normal_entry();
+  BlockBuilder builder(flow_graph, normal_entry, /*with_frame=*/false);
+  Definition* local = GetThreadLocalValue(flow_graph, &builder);
+
+  builder.AddReturn(new Value(local));
+  return true;
+}
+
+bool GraphIntrinsifier::Build_ThreadLocalHasValue(FlowGraph* flow_graph) {
+  GraphEntryInstr* graph_entry = flow_graph->graph_entry();
+  auto normal_entry = graph_entry->normal_entry();
+  BlockBuilder builder(flow_graph, normal_entry, /*with_frame=*/false);
+  Definition* local = GetThreadLocalValue(flow_graph, &builder);
+
+  Definition* sentinel = flow_graph->GetConstant(Object::sentinel());
+  Definition* result = builder.AddDefinition(new StrictCompareInstr(
+      builder.Source(), Token::kNE_STRICT, new Value(local),
+      new Value(sentinel), /*needs_number_check=*/false, DeoptId::kNone));
+
+  builder.AddReturn(new Value(result));
+  return true;
+}
+
 }  // namespace compiler
 }  // namespace dart

runtime/vm/compiler/recognized_methods_list.h

@@ -670,6 +670,8 @@ namespace dart {
   V(TypedDataLibrary, _Float64x2, /, Float64x2Div, 0x12925562)                 \
   V(TypedDataLibrary, _Float64x2, -, Float64x2Sub, 0x2f258e89)                 \
   V(TypedDataLibrary, _Float64x2, +, Float64x2Add, 0x09ecc418)                 \
+  V(VMLibrary, ThreadLocal, _getValue, ThreadLocalGetValue, 0xad8f22db)        \
+  V(VMLibrary, ThreadLocal, _hasValue, ThreadLocalHasValue, 0xa6d3b876)        \
 
 #define RECOGNIZED_LIST(V)                                                     \
   OTHER_RECOGNIZED_LIST(V)                                                     \

runtime/vm/compiler/runtime_api.h

@@ -1156,6 +1156,7 @@ class Thread : public AllStatic {
   static uword exit_through_ffi();
   static word dart_stream_offset();
   static word service_extension_stream_offset();
+  static word thread_locals_offset();
   static word predefined_symbols_address_offset();
   static word optimize_entry_offset();
   static word deoptimize_entry_offset();