Merge pull request 'refactoring' (dart-lang#18) from fibers into main

Reviewed-on: http://git.local/dependencies/dart/pulls/18

Author: antonbashir

runtime/vm/compiler/stub_code_compiler.cc

@@ -3233,7 +3233,7 @@ void StubCodeCompiler::GenerateSubtypeTestCacheSearch(
 #endif
 
 void StubCodeCompiler::GenerateCoroutineInitializeStub() {
-   const Register kCoroutine = CoroutineEntryABI::kCoroutineReg;
+   const Register kCoroutine = CoroutineInitializeABI::kCoroutineReg;
 
  #if defined(TARGET_ARCH_ARM) || defined(TARGET_ARCH_ARM64)
   SPILLS_LR_TO_FRAME({});

runtime/vm/constants_x64.h

@@ -388,17 +388,13 @@ struct SuspendStubABI {
   static constexpr intptr_t kResumePcDistance = 5;
 };
 
-struct CoroutineEntryABI {
-  static constexpr Register kCoroutineReg = RDI;
-};
-
 struct CoroutineInitializeABI {
-  static constexpr Register kCoroutineReg = CoroutineEntryABI::kCoroutineReg;
+  static constexpr Register kCoroutineReg = RDI;
 };
 
 struct CoroutineForkABI {
   static constexpr Register kCallerCoroutineReg = RSI;
-  static constexpr Register kForkedCoroutineReg = CoroutineEntryABI::kCoroutineReg;
+  static constexpr Register kForkedCoroutineReg = RDI;
 };
 
 struct CoroutineTransferABI {

runtime/vm/object_store.cc

@@ -6,7 +6,6 @@
 
 #include "vm/dart_entry.h"
 #include "vm/exceptions.h"
-#include "vm/flags.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"

runtime/vm/raw_object.cc

@@ -668,8 +668,7 @@ intptr_t UntaggedCoroutine::VisitCoroutinePointers(
       if (native_stack != 0 &&
           (attributes & (Coroutine::CoroutineAttributes::suspended |
                          Coroutine::CoroutineAttributes::running)) != 0) {
-        const uword sp = native_stack;
-        const uword fp = *reinterpret_cast<uword*>(sp);
+        const uword fp = *reinterpret_cast<uword*>(native_stack);
         StackFrameIterator frames_iterator(
             fp, ValidationPolicy::kDontValidateFrames, thread,
             StackFrameIterator::kNoCrossThreadIteration,
@@ -682,8 +681,7 @@ intptr_t UntaggedCoroutine::VisitCoroutinePointers(
       }
 
       if ((attributes & (Coroutine::CoroutineAttributes::suspended)) != 0) {
-        const uword sp = stack;
-        const uword fp = *reinterpret_cast<uword*>(sp);
+        const uword fp = *reinterpret_cast<uword*>(stack);
         StackFrameIterator frames_iterator(
             fp, ValidationPolicy::kDontValidateFrames, thread,
             StackFrameIterator::kNoCrossThreadIteration,

sdk/lib/isolate/isolate.dart

@@ -89,7 +89,7 @@ final class Isolate {
   ///
   /// Some control messages require a specific capability to be passed along
   /// with the message (see [pauseCapability] and [terminateCapability]),
-  /// otherwise the message is ignored by the isolate.ц
+  /// otherwise the message is ignored by the isolate.
   final SendPort controlPort;
 
   /// Capability granting the ability to pause the isolate.