Merge pull request 'Fibers dart-lang#5' (dart-lang#4) from fibers int…

…o main Reviewed-on: http://git.local/dependencies/dart/pulls/4
antonbashir · Sep 1, 2024 · 81b3c13 · 81b3c13
2 parents 43bf06b + f269c2b
commit 81b3c13
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 16 deletions.
diff --git a/runtime/vm/compiler/frontend/kernel_binary_flowgraph.cc b/runtime/vm/compiler/frontend/kernel_binary_flowgraph.cc
@@ -15,7 +15,6 @@
 #include "vm/object_store.h"
 #include "vm/resolver.h"
 #include "vm/stack_frame.h"
-#include "vm/token_position.h"
 
 namespace dart {
 namespace kernel {

diff --git a/runtime/vm/compiler/frontend/kernel_binary_flowgraph.h b/runtime/vm/compiler/frontend/kernel_binary_flowgraph.h
@@ -375,7 +375,6 @@ class StreamingFlowGraphBuilder : public KernelReaderHelper {
 
   // Build flow graph for '_nativeEffect'.
   Fragment BuildNativeEffect();
-
 
   // Build the call-site manually, to avoid doing initialization checks
   // for late fields.

diff --git a/runtime/vm/compiler/stub_code_compiler.cc b/runtime/vm/compiler/stub_code_compiler.cc
@@ -2402,7 +2402,6 @@ void StubCodeCompiler::GenerateResumeStub() {
     __ Bind(&okay);
   }
 #endif
-
   if (!FLAG_precompiled_mode) {
     // Copy Code object (part of the fixed frame which is not copied below)
     // and restore pool pointer.

diff --git a/runtime/vm/isolate.h b/runtime/vm/isolate.h
@@ -1624,14 +1624,23 @@ class Isolate : public BaseIsolate, public IntrusiveDListEntry<Isolate> {
   VMTagCounters vm_tag_counters_;
 
   // We use 6 list entries for each pending service extension calls.
-  enum {kPendingHandlerIndex = 0, kPendingMethodNameIndex, kPendingKeysIndex,
-        kPendingValuesIndex,      kPendingReplyPortIndex,  kPendingIdIndex,
-        kPendingEntrySize};
+	  enum {
+    kPendingHandlerIndex = 0,
+    kPendingMethodNameIndex,
+    kPendingKeysIndex,
+    kPendingValuesIndex,
+    kPendingReplyPortIndex,
+    kPendingIdIndex,
+    kPendingEntrySize
+  };
   GrowableObjectArrayPtr pending_service_extension_calls_;
 
   // We use 2 list entries for each registered extension handler.
-  enum {kRegisteredNameIndex = 0, kRegisteredHandlerIndex,
-        kRegisteredEntrySize};
+  enum {
+    kRegisteredNameIndex = 0,
+    kRegisteredHandlerIndex,
+    kRegisteredEntrySize
+  };
   GrowableObjectArrayPtr registered_service_extension_handlers_;
 
   // Used to wake the isolate when it is in the pause event loop.

diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
@@ -3,7 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/object.h"
-#include <sys/mman.h>
 
 #include <memory>
 
@@ -829,8 +828,8 @@ void Object::Init(IsolateGroup* isolate_group) {
   sentinel_class_ = cls.ptr();
 
   // Allocate and initialize the sentinel values.
-  { 
-    *sentinel_ ^= Sentinel::New(); 
+  {
+    *sentinel_ ^= Sentinel::New();
   }
 
   // Allocate and initialize optimizing compiler constants.

diff --git a/runtime/vm/object.h b/runtime/vm/object.h
@@ -5,7 +5,6 @@
 #ifndef RUNTIME_VM_OBJECT_H_
 #define RUNTIME_VM_OBJECT_H_
 
-#include "vm/tagged_pointer.h"
 #if defined(SHOULD_NOT_INCLUDE_RUNTIME)
 #error "Should not include runtime"
 #endif
@@ -7040,7 +7039,7 @@ class Code : public Object {
 
     // Layout of entries describing comments.
     enum {
-      kPCOffsetEntry = 0,  // PC offset to a comment as a Smi.    
+      kPCOffsetEntry = 0,  // PC offset to a comment as a Smi.   
       kCommentEntry,       // Comment text as a String.
       kNumberOfEntries
     };

diff --git a/runtime/vm/thread.cc b/runtime/vm/thread.cc
@@ -3,7 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/thread.h"
-#include <cstddef>
 
 #include "vm/cpu.h"
 #include "vm/dart_api_state.h"
@@ -23,7 +22,6 @@
 #include "vm/service.h"
 #include "vm/stub_code.h"
 #include "vm/symbols.h"
-#include "vm/tagged_pointer.h"
 #include "vm/thread_interrupter.h"
 #include "vm/thread_registry.h"
 #include "vm/timeline.h"

diff --git a/tests/corelib/list_test.dart b/tests/corelib/list_test.dart
@@ -590,4 +590,4 @@ void testListConstructor() {
   Expect.throws(() => new List.filled(0, 42).add(4));
   // Not negative.
   Expect.throws(() => new List.filled(-2, 42));
-}
+}