[vm,dynamic_modules] Fix dynamic modules build for arm64 and arm

TEST=tools/build.py -a simarm64 -m debug --dart-dynamic-modules runtime runtime_precompiled
TEST=tools/build.py -a simarm -m debug --dart-dynamic-modules runtime runtime_precompiled
Fixes b/391269628

Change-Id: Ic352b967d887c7753d1664d2cd9b66ebc4205222
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/405240
Reviewed-by: Slava Egorov <[email protected]>
Commit-Queue: Alexander Markov <[email protected]>

Author: alexmarkov

runtime/vm/compiler/stub_code_compiler.cc

@@ -2388,14 +2388,15 @@ void StubCodeCompiler::GenerateResumeStub() {
   }
 
 #if defined(DART_DYNAMIC_MODULES)
-  __ Comment("Resume interpreter with exception");
-  __ Bind(&resume_interpreter);
-
 #if defined(TARGET_ARCH_ARM) || defined(TARGET_ARCH_ARM64)
   // This case is used when Dart frame is still on the stack.
-  SPILLS_LR_TO_FRAME({});
+  if (FLAG_precompiled_mode) {
+    RESTORES_LR_FROM_FRAME({});  // Undo EnterStubFrame() from the case above.
+  }
+  SPILLS_RETURN_ADDRESS_FROM_LR_TO_REGISTER({});  // Undo SetReturnAddress().
 #endif
-
+  __ Comment("Resume interpreter with exception");
+  __ Bind(&resume_interpreter);
   __ PushObject(NullObject());  // Make room for result.
   __ PushObject(NullObject());  // Return value.
   __ PushRegistersInOrder({kException, kStackTrace});

runtime/vm/compiler/stub_code_compiler_arm.cc

@@ -2790,7 +2790,7 @@ void StubCodeCompiler::GenerateInterpretCallStub() {
   {
     Label ok;
     // Check that we are always entering from Dart code.
-    __ LoadFromOffset(kWord, R8, THR, target::Thread::vm_tag_offset());
+    __ LoadFromOffset(R8, THR, target::Thread::vm_tag_offset());
     __ CompareImmediate(R8, VMTag::kDartTagId);
     __ b(&ok, EQ);
     __ Stop("Not coming from Dart code.");
@@ -2799,10 +2799,9 @@ void StubCodeCompiler::GenerateInterpretCallStub() {
 #endif
 
   // Adjust arguments count for type arguments vector.
-  __ LoadFieldFromOffset(kWord, R2, R4,
-                         target::ArgumentsDescriptor::count_offset());
+  __ LoadFieldFromOffset(R2, R4, target::ArgumentsDescriptor::count_offset());
   __ SmiUntag(R2);
-  __ LoadFieldFromOffset(kWord, R1, R4,
+  __ LoadFieldFromOffset(R1, R4,
                          target::ArgumentsDescriptor::type_args_len_offset());
   __ cmp(R1, Operand(0));
   __ AddImmediate(R2, R2, 1, NE);  // Include the type arguments.
@@ -2828,31 +2827,29 @@ void StubCodeCompiler::GenerateInterpretCallStub() {
 
   // Save exit frame information to enable stack walking as we are about
   // to transition to Dart VM C++ code.
-  __ StoreToOffset(kWord, FP, THR,
-                   target::Thread::top_exit_frame_info_offset());
+  __ StoreToOffset(FP, THR, target::Thread::top_exit_frame_info_offset());
 
   // Mark that the thread exited generated code through a runtime call.
   __ LoadImmediate(R5, target::Thread::exit_through_runtime_call());
-  __ StoreToOffset(kWord, R5, THR, target::Thread::exit_through_ffi_offset());
+  __ StoreToOffset(R5, THR, target::Thread::exit_through_ffi_offset());
 
   // Mark that the thread is executing VM code.
-  __ LoadFromOffset(kWord, R5, THR,
+  __ LoadFromOffset(R5, THR,
                     target::Thread::interpret_call_entry_point_offset());
-  __ StoreToOffset(kWord, R5, THR, target::Thread::vm_tag_offset());
+  __ StoreToOffset(R5, THR, target::Thread::vm_tag_offset());
 
   __ blx(R5);
 
   // Mark that the thread is executing Dart code.
   __ LoadImmediate(R2, VMTag::kDartTagId);
-  __ StoreToOffset(kWord, R2, THR, target::Thread::vm_tag_offset());
+  __ StoreToOffset(R2, THR, target::Thread::vm_tag_offset());
 
   // Mark that the thread has not exited generated Dart code.
   __ LoadImmediate(R2, 0);
-  __ StoreToOffset(kWord, R2, THR, target::Thread::exit_through_ffi_offset());
+  __ StoreToOffset(R2, THR, target::Thread::exit_through_ffi_offset());
 
   // Reset exit frame information in Isolate's mutator thread structure.
-  __ StoreToOffset(kWord, R2, THR,
-                   target::Thread::top_exit_frame_info_offset());
+  __ StoreToOffset(R2, THR, target::Thread::top_exit_frame_info_offset());
 
   __ LeaveStubFrame();
   __ Ret();

runtime/vm/native_arguments.h

@@ -196,6 +196,7 @@ class NativeArguments {
         argc_tag_(ReverseArgOrderBit::update(true, argc_tag)),
         argv_(argv),
         retval_(retval) {}
+  NativeArguments() = default;
 #endif  // defined(DART_DYNAMIC_MODULES)
 
   // Since this function is passed an ObjectPtr directly, we need to be