VM: [Kernel] Implement CatchBlockEntryInstr::should_restore_closure_context on all platforms.

runtime/vm/intermediate_language_arm.cc

 
 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_ARM.
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/intermediate_language.h"
 
@@ skipping 2889 matching lines @@
   // Auxiliary variables introduced by the try catch can be captured if we are
   // inside a function with yield/resume points. In this case we first need
   // to restore the context to match the context at entry into the closure.
   if (should_restore_closure_context()) {
     const ParsedFunction& parsed_function = compiler->parsed_function();
     ASSERT(parsed_function.function().IsClosureFunction());
     LocalScope* scope = parsed_function.node_sequence()->scope();
 
     LocalVariable* closure_parameter = scope->VariableAt(0);
     ASSERT(!closure_parameter->is_captured());
-    __ ldr(CTX, Address(FP, closure_parameter->index() * kWordSize));
-    __ ldr(CTX, FieldAddress(CTX, Closure::context_offset()));
+    __ LoadFromOffset(kWord, CTX, FP, closure_parameter->index() * kWordSize);
+    __ LoadFieldFromOffset(kWord, CTX, CTX, Closure::context_offset());
 
     const intptr_t context_index =
         parsed_function.current_context_var()->index();
     __ StoreToOffset(kWord, CTX, FP, context_index * kWordSize);
   }
 
   // Initialize exception and stack trace variables.
   if (exception_var().is_captured()) {
     ASSERT(stacktrace_var().is_captured());
     __ StoreIntoObjectOffset(CTX,
@@ skipping 4335 matching lines @@
   compiler->GenerateRuntimeCall(TokenPosition::kNoSource, deopt_id(),
                                 kGrowRegExpStackRuntimeEntry, 1, locs());
   __ Drop(1);
   __ Pop(result);
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM