[vm/usertag] Move usertags from Isolate to Thread.

This allows use of usertag api in isolategroup-bound context.

BUG=#61325
TEST=ci

Change-Id: I73d5631ba6eddcc06965b982bc199221ac021cd5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/445967
Commit-Queue: Alexander Aprelev <[email protected]>
Reviewed-by: Ryan Macnak <[email protected]>

Author: aam

runtime/include/dart_tools_api.h

@@ -535,14 +535,14 @@ Dart_IsolateGroupHeapNewExternalMetric(Dart_IsolateGroup group);  // Byte
  */
 
 /*
- * Gets the current isolate's currently set UserTag instance.
+ * Gets the current Dart thread's currently set UserTag instance.
  *
  * \return The currently set UserTag instance.
  */
 DART_EXPORT Dart_Handle Dart_GetCurrentUserTag();
 
 /*
- * Gets the current isolate's default UserTag instance.
+ * Gets the current Dart thread's default UserTag instance.
  *
  * \return The default UserTag with label 'Default'
  */
@@ -558,7 +558,7 @@ DART_EXPORT Dart_Handle Dart_GetDefaultUserTag();
 DART_EXPORT Dart_Handle Dart_NewUserTag(const char* label);
 
 /*
- * Updates the current isolate's UserTag to a new value.
+ * Updates the current Dart thread's UserTag to a new value.
  *
  * \param user_tag The UserTag to be set as the current UserTag.
  *

runtime/lib/profiler.cc

@@ -19,7 +19,7 @@ DEFINE_NATIVE_ENTRY(UserTag_new, 0, 2) {
   ASSERT(
       TypeArguments::CheckedHandle(zone, arguments->NativeArgAt(0)).IsNull());
   GET_NON_NULL_NATIVE_ARGUMENT(String, tag_label, arguments->NativeArgAt(1));
-  return UserTag::New(tag_label);
+  return UserTag::New(thread, tag_label);
 }
 
 DEFINE_NATIVE_ENTRY(UserTag_label, 0, 1) {
@@ -36,14 +36,14 @@ DEFINE_NATIVE_ENTRY(UserTag_defaultTag, 0, 0) {
   if (FLAG_trace_intrinsified_natives) {
     OS::PrintErr("UserTag_defaultTag\n");
   }
-  return isolate->default_tag();
+  return thread->default_tag();
 }
 
 DEFINE_NATIVE_ENTRY(Profiler_getCurrentTag, 0, 0) {
   if (FLAG_trace_intrinsified_natives) {
     OS::PrintErr("Profiler_getCurrentTag\n");
   }
-  return isolate->current_tag();
+  return thread->current_tag();
 }
 
 }  // namespace dart

runtime/vm/compiler/asm_intrinsifier_arm.cc

@@ -1740,15 +1740,13 @@ void AsmIntrinsifier::IntrinsifyRegExpExecuteMatch(Assembler* assembler,
 
 void AsmIntrinsifier::UserTag_defaultTag(Assembler* assembler,
                                          Label* normal_ir_body) {
-  __ LoadIsolate(R0);
-  __ ldr(R0, Address(R0, target::Isolate::default_tag_offset()));
+  __ ldr(R0, Address(THR, target::Thread::default_tag_offset()));
   __ Ret();
 }
 
 void AsmIntrinsifier::Profiler_getCurrentTag(Assembler* assembler,
                                              Label* normal_ir_body) {
-  __ LoadIsolate(R0);
-  __ ldr(R0, Address(R0, target::Isolate::current_tag_offset()));
+  __ ldr(R0, Address(THR, target::Thread::current_tag_offset()));
   __ Ret();
 }
 

runtime/vm/compiler/asm_intrinsifier_arm64.cc

@@ -1981,15 +1981,13 @@ void AsmIntrinsifier::IntrinsifyRegExpExecuteMatch(Assembler* assembler,
 
 void AsmIntrinsifier::UserTag_defaultTag(Assembler* assembler,
                                          Label* normal_ir_body) {
-  __ LoadIsolate(R0);
-  __ ldr(R0, Address(R0, target::Isolate::default_tag_offset()));
+  __ ldr(R0, Address(THR, target::Thread::default_tag_offset()));
   __ ret();
 }
 
 void AsmIntrinsifier::Profiler_getCurrentTag(Assembler* assembler,
                                              Label* normal_ir_body) {
-  __ LoadIsolate(R0);
-  __ ldr(R0, Address(R0, target::Isolate::current_tag_offset()));
+  __ ldr(R0, Address(THR, target::Thread::current_tag_offset()));
   __ ret();
 }
 

runtime/vm/compiler/asm_intrinsifier_ia32.cc

@@ -1777,15 +1777,13 @@ void AsmIntrinsifier::IntrinsifyRegExpExecuteMatch(Assembler* assembler,
 
 void AsmIntrinsifier::UserTag_defaultTag(Assembler* assembler,
                                          Label* normal_ir_body) {
-  __ LoadIsolate(EAX);
-  __ movl(EAX, Address(EAX, target::Isolate::default_tag_offset()));
+  __ movl(EAX, Address(THR, target::Thread::default_tag_offset()));
   __ ret();
 }
 
 void AsmIntrinsifier::Profiler_getCurrentTag(Assembler* assembler,
                                              Label* normal_ir_body) {
-  __ LoadIsolate(EAX);
-  __ movl(EAX, Address(EAX, target::Isolate::current_tag_offset()));
+  __ movl(EAX, Address(THR, target::Thread::current_tag_offset()));
   __ ret();
 }
 

runtime/vm/compiler/asm_intrinsifier_riscv.cc

@@ -1997,15 +1997,13 @@ void AsmIntrinsifier::IntrinsifyRegExpExecuteMatch(Assembler* assembler,
 
 void AsmIntrinsifier::UserTag_defaultTag(Assembler* assembler,
                                          Label* normal_ir_body) {
-  __ LoadIsolate(A0);
-  __ lx(A0, Address(A0, target::Isolate::default_tag_offset()));
+  __ lx(A0, Address(THR, target::Thread::default_tag_offset()));
   __ ret();
 }
 
 void AsmIntrinsifier::Profiler_getCurrentTag(Assembler* assembler,
                                              Label* normal_ir_body) {
-  __ LoadIsolate(A0);
-  __ lx(A0, Address(A0, target::Isolate::current_tag_offset()));
+  __ lx(A0, Address(THR, target::Thread::current_tag_offset()));
   __ ret();
 }
 

runtime/vm/compiler/asm_intrinsifier_x64.cc

@@ -1877,15 +1877,13 @@ void AsmIntrinsifier::IntrinsifyRegExpExecuteMatch(Assembler* assembler,
 
 void AsmIntrinsifier::UserTag_defaultTag(Assembler* assembler,
                                          Label* normal_ir_body) {
-  __ LoadIsolate(RAX);
-  __ movq(RAX, Address(RAX, target::Isolate::default_tag_offset()));
+  __ movq(RAX, Address(THR, target::Thread::default_tag_offset()));
   __ ret();
 }
 
 void AsmIntrinsifier::Profiler_getCurrentTag(Assembler* assembler,
                                              Label* normal_ir_body) {
-  __ LoadIsolate(RAX);
-  __ movq(RAX, Address(RAX, target::Isolate::current_tag_offset()));
+  __ movq(RAX, Address(THR, target::Thread::current_tag_offset()));
   __ ret();
 }
 

runtime/vm/compiler/runtime_api.h

@@ -1302,6 +1302,10 @@ class Thread : public AllStatic {
   static word single_step_offset();
 #endif  // !defined(PRODUCT)
 
+  static word default_tag_offset();
+  static word current_tag_offset();
+  static word user_tag_offset();
+
   static word OffsetFromThread(const dart::Object& object);
   static intptr_t OffsetFromThread(const dart::RuntimeEntry* runtime_entry);
 };
@@ -1345,9 +1349,6 @@ class ObjectStore : public AllStatic {
 
 class Isolate : public AllStatic {
  public:
-  static word default_tag_offset();
-  static word current_tag_offset();
-  static word user_tag_offset();
   static word finalizers_offset();
 #if !defined(PRODUCT)
   static word has_resumption_breakpoints_offset();