Skip to content

Commit 81b3c13

Browse files
committed
Merge pull request 'Fibers dart-lang#5' (#4) from fibers into main
Reviewed-on: http://git.local/dependencies/dart/pulls/4
2 parents 43bf06b + f269c2b commit 81b3c13

File tree

8 files changed

+18
-16
lines changed

8 files changed

+18
-16
lines changed

runtime/vm/compiler/frontend/kernel_binary_flowgraph.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "vm/object_store.h"
1616
#include "vm/resolver.h"
1717
#include "vm/stack_frame.h"
18-
#include "vm/token_position.h"
1918

2019
namespace dart {
2120
namespace kernel {

runtime/vm/compiler/frontend/kernel_binary_flowgraph.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@ class StreamingFlowGraphBuilder : public KernelReaderHelper {
375375

376376
// Build flow graph for '_nativeEffect'.
377377
Fragment BuildNativeEffect();
378-
379378

380379
// Build the call-site manually, to avoid doing initialization checks
381380
// for late fields.

runtime/vm/compiler/stub_code_compiler.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2402,7 +2402,6 @@ void StubCodeCompiler::GenerateResumeStub() {
24022402
__ Bind(&okay);
24032403
}
24042404
#endif
2405-
24062405
if (!FLAG_precompiled_mode) {
24072406
// Copy Code object (part of the fixed frame which is not copied below)
24082407
// and restore pool pointer.

runtime/vm/isolate.h

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1624,14 +1624,23 @@ class Isolate : public BaseIsolate, public IntrusiveDListEntry<Isolate> {
16241624
VMTagCounters vm_tag_counters_;
16251625

16261626
// We use 6 list entries for each pending service extension calls.
1627-
enum {kPendingHandlerIndex = 0, kPendingMethodNameIndex, kPendingKeysIndex,
1628-
kPendingValuesIndex, kPendingReplyPortIndex, kPendingIdIndex,
1629-
kPendingEntrySize};
1627+
enum {
1628+
kPendingHandlerIndex = 0,
1629+
kPendingMethodNameIndex,
1630+
kPendingKeysIndex,
1631+
kPendingValuesIndex,
1632+
kPendingReplyPortIndex,
1633+
kPendingIdIndex,
1634+
kPendingEntrySize
1635+
};
16301636
GrowableObjectArrayPtr pending_service_extension_calls_;
16311637

16321638
// We use 2 list entries for each registered extension handler.
1633-
enum {kRegisteredNameIndex = 0, kRegisteredHandlerIndex,
1634-
kRegisteredEntrySize};
1639+
enum {
1640+
kRegisteredNameIndex = 0,
1641+
kRegisteredHandlerIndex,
1642+
kRegisteredEntrySize
1643+
};
16351644
GrowableObjectArrayPtr registered_service_extension_handlers_;
16361645

16371646
// Used to wake the isolate when it is in the pause event loop.

runtime/vm/object.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
#include "vm/object.h"
6-
#include <sys/mman.h>
76

87
#include <memory>
98

@@ -829,8 +828,8 @@ void Object::Init(IsolateGroup* isolate_group) {
829828
sentinel_class_ = cls.ptr();
830829

831830
// Allocate and initialize the sentinel values.
832-
{
833-
*sentinel_ ^= Sentinel::New();
831+
{
832+
*sentinel_ ^= Sentinel::New();
834833
}
835834

836835
// Allocate and initialize optimizing compiler constants.

runtime/vm/object.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#ifndef RUNTIME_VM_OBJECT_H_
66
#define RUNTIME_VM_OBJECT_H_
77

8-
#include "vm/tagged_pointer.h"
98
#if defined(SHOULD_NOT_INCLUDE_RUNTIME)
109
#error "Should not include runtime"
1110
#endif
@@ -7040,7 +7039,7 @@ class Code : public Object {
70407039

70417040
// Layout of entries describing comments.
70427041
enum {
7043-
kPCOffsetEntry = 0, // PC offset to a comment as a Smi.
7042+
kPCOffsetEntry = 0, // PC offset to a comment as a Smi.
70447043
kCommentEntry, // Comment text as a String.
70457044
kNumberOfEntries
70467045
};

runtime/vm/thread.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
#include "vm/thread.h"
6-
#include <cstddef>
76

87
#include "vm/cpu.h"
98
#include "vm/dart_api_state.h"
@@ -23,7 +22,6 @@
2322
#include "vm/service.h"
2423
#include "vm/stub_code.h"
2524
#include "vm/symbols.h"
26-
#include "vm/tagged_pointer.h"
2725
#include "vm/thread_interrupter.h"
2826
#include "vm/thread_registry.h"
2927
#include "vm/timeline.h"

tests/corelib/list_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,4 +590,4 @@ void testListConstructor() {
590590
Expect.throws(() => new List.filled(0, 42).add(4));
591591
// Not negative.
592592
Expect.throws(() => new List.filled(-2, 42));
593-
}
593+
}

0 commit comments

Comments
 (0)