Skip to content

Commit bbf3403

Browse files
askeksacommit-bot@chromium.org
askeksa
authored and
[email protected]
committed
Revert "[vm] Check prefix.loadLibrary is called and returns before prefix members are used."
This reverts commit f049a41. Reason for revert: Broke reload bots. Original change's description: > [vm] Check prefix.loadLibrary is called and returns before prefix members are used. > > Not loading is actually deferred. > > Bug: #41974 > Change-Id: I62688007bd36dbcb2e8ffb4a1fd2dceb1775b1c8 > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/149053 > Commit-Queue: Ryan Macnak <[email protected]> > Reviewed-by: Siva Annamalai <[email protected]> [email protected],[email protected],[email protected] Change-Id: I923e339465fdf13199efc11a9cef4a842abebd67 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: #41974 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/149423 Reviewed-by: Aske Simon Christensen <[email protected]> Commit-Queue: Aske Simon Christensen <[email protected]>
1 parent f585be5 commit bbf3403

File tree

14 files changed

+56
-138
lines changed

14 files changed

+56
-138
lines changed

‎runtime/lib/object.cc

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -196,19 +196,6 @@ DEFINE_NATIVE_ENTRY(Type_equality, 0, 2) {
196196
return Bool::Get(type.IsEquivalent(other, TypeEquality::kSyntactical)).raw();
197197
}
198198

199-
DEFINE_NATIVE_ENTRY(LibraryPrefix_isLoaded, 0, 1) {
200-
const LibraryPrefix& prefix =
201-
LibraryPrefix::CheckedHandle(zone, arguments->NativeArgAt(0));
202-
return Bool::Get(prefix.is_loaded()).raw();
203-
}
204-
205-
DEFINE_NATIVE_ENTRY(LibraryPrefix_setLoaded, 0, 1) {
206-
const LibraryPrefix& prefix =
207-
LibraryPrefix::CheckedHandle(zone, arguments->NativeArgAt(0));
208-
prefix.set_is_loaded(true);
209-
return Instance::null();
210-
}
211-
212199
DEFINE_NATIVE_ENTRY(Internal_inquireIs64Bit, 0, 0) {
213200
#if defined(ARCH_IS_64_BIT)
214201
return Bool::True().raw();

‎runtime/vm/bootstrap_natives.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ namespace dart {
3131
V(AbstractType_toString, 1) \
3232
V(Type_getHashCode, 1) \
3333
V(Type_equality, 2) \
34-
V(LibraryPrefix_isLoaded, 1) \
35-
V(LibraryPrefix_setLoaded, 1) \
3634
V(Identical_comparison, 2) \
3735
V(Integer_bitAndFromInteger, 2) \
3836
V(Integer_bitOrFromInteger, 2) \

‎runtime/vm/clustered_snapshot.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3248,7 +3248,6 @@ class LibraryPrefixDeserializationCluster : public DeserializationCluster {
32483248
ReadFromTo(prefix);
32493249
prefix->ptr()->num_imports_ = d->Read<uint16_t>();
32503250
prefix->ptr()->is_deferred_load_ = d->Read<bool>();
3251-
prefix->ptr()->is_loaded_ = false;
32523251
}
32533252
}
32543253
};

‎runtime/vm/compiler/backend/il.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,8 +1099,7 @@ ConstantInstr::ConstantInstr(const Object& value, TokenPosition token_pos)
10991099
// tables used for certain character classes are represented as TypedData,
11001100
// and so those values are also neither immutable (as there are no immutable
11011101
// TypedData values) or canonical.
1102-
ASSERT(value.IsTypeParameter() || value.IsArray() || value.IsTypedData() ||
1103-
value.IsLibraryPrefix());
1102+
ASSERT(value.IsTypeParameter() || value.IsArray() || value.IsTypedData());
11041103
}
11051104
#endif
11061105
}

‎runtime/vm/compiler/frontend/kernel_binary_flowgraph.cc

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,9 +1363,9 @@ Fragment StreamingFlowGraphBuilder::BuildExpression(TokenPosition* position) {
13631363
case kInstantiation:
13641364
return BuildPartialTearoffInstantiation(position);
13651365
case kLoadLibrary:
1366-
return BuildLibraryPrefixAction(position, Symbols::LoadLibrary());
13671366
case kCheckLibraryIsLoaded:
1368-
return BuildLibraryPrefixAction(position, Symbols::CheckLoaded());
1367+
ReadUInt(); // skip library index
1368+
return BuildFutureNullValue(position);
13691369
case kConstStaticInvocation:
13701370
case kConstConstructorInvocation:
13711371
case kConstListLiteral:
@@ -4067,26 +4067,6 @@ Fragment StreamingFlowGraphBuilder::BuildPartialTearoffInstantiation(
40674067
return instructions;
40684068
}
40694069

4070-
Fragment StreamingFlowGraphBuilder::BuildLibraryPrefixAction(
4071-
TokenPosition* position,
4072-
const String& selector) {
4073-
const intptr_t dependency_index = ReadUInt();
4074-
const Library& current_library = Library::Handle(
4075-
Z, Class::Handle(Z, parsed_function()->function().Owner()).library());
4076-
const Array& dependencies = Array::Handle(Z, current_library.dependencies());
4077-
const LibraryPrefix& prefix =
4078-
LibraryPrefix::CheckedZoneHandle(Z, dependencies.At(dependency_index));
4079-
const Function& function =
4080-
Function::ZoneHandle(Z, Library::Handle(Z, Library::CoreLibrary())
4081-
.LookupFunctionAllowPrivate(selector));
4082-
ASSERT(!function.IsNull());
4083-
Fragment instructions;
4084-
instructions += Constant(prefix);
4085-
instructions +=
4086-
StaticCall(TokenPosition::kNoSource, function, 1, ICData::kStatic);
4087-
return instructions;
4088-
}
4089-
40904070
Fragment StreamingFlowGraphBuilder::BuildExpressionStatement() {
40914071
Fragment instructions = BuildExpression(); // read expression.
40924072
instructions += Drop();

‎runtime/vm/compiler/frontend/kernel_binary_flowgraph.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,6 @@ class StreamingFlowGraphBuilder : public KernelReaderHelper {
335335
Fragment BuildFutureNullValue(TokenPosition* position);
336336
Fragment BuildConstantExpression(TokenPosition* position, Tag tag);
337337
Fragment BuildPartialTearoffInstantiation(TokenPosition* position);
338-
Fragment BuildLibraryPrefixAction(TokenPosition* position,
339-
const String& selector);
340338

341339
Fragment BuildExpressionStatement();
342340
Fragment BuildBlock();

‎runtime/vm/compiler/runtime_offsets_extracted.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ static constexpr dart::compiler::target::word Integer_InstanceSize = 4;
442442
static constexpr dart::compiler::target::word KernelProgramInfo_InstanceSize =
443443
64;
444444
static constexpr dart::compiler::target::word LanguageError_InstanceSize = 28;
445-
static constexpr dart::compiler::target::word Library_InstanceSize = 80;
445+
static constexpr dart::compiler::target::word Library_InstanceSize = 76;
446446
static constexpr dart::compiler::target::word LibraryPrefix_InstanceSize = 20;
447447
static constexpr dart::compiler::target::word LinkedHashMap_InstanceSize = 28;
448448
static constexpr dart::compiler::target::word LocalVarDescriptors_InstanceSize =
@@ -927,7 +927,7 @@ static constexpr dart::compiler::target::word Integer_InstanceSize = 8;
927927
static constexpr dart::compiler::target::word KernelProgramInfo_InstanceSize =
928928
128;
929929
static constexpr dart::compiler::target::word LanguageError_InstanceSize = 48;
930-
static constexpr dart::compiler::target::word Library_InstanceSize = 152;
930+
static constexpr dart::compiler::target::word Library_InstanceSize = 144;
931931
static constexpr dart::compiler::target::word LibraryPrefix_InstanceSize = 40;
932932
static constexpr dart::compiler::target::word LinkedHashMap_InstanceSize = 56;
933933
static constexpr dart::compiler::target::word LocalVarDescriptors_InstanceSize =
@@ -1404,7 +1404,7 @@ static constexpr dart::compiler::target::word Integer_InstanceSize = 4;
14041404
static constexpr dart::compiler::target::word KernelProgramInfo_InstanceSize =
14051405
64;
14061406
static constexpr dart::compiler::target::word LanguageError_InstanceSize = 28;
1407-
static constexpr dart::compiler::target::word Library_InstanceSize = 80;
1407+
static constexpr dart::compiler::target::word Library_InstanceSize = 76;
14081408
static constexpr dart::compiler::target::word LibraryPrefix_InstanceSize = 20;
14091409
static constexpr dart::compiler::target::word LinkedHashMap_InstanceSize = 28;
14101410
static constexpr dart::compiler::target::word LocalVarDescriptors_InstanceSize =
@@ -1890,7 +1890,7 @@ static constexpr dart::compiler::target::word Integer_InstanceSize = 8;
18901890
static constexpr dart::compiler::target::word KernelProgramInfo_InstanceSize =
18911891
128;
18921892
static constexpr dart::compiler::target::word LanguageError_InstanceSize = 48;
1893-
static constexpr dart::compiler::target::word Library_InstanceSize = 152;
1893+
static constexpr dart::compiler::target::word Library_InstanceSize = 144;
18941894
static constexpr dart::compiler::target::word LibraryPrefix_InstanceSize = 40;
18951895
static constexpr dart::compiler::target::word LinkedHashMap_InstanceSize = 56;
18961896
static constexpr dart::compiler::target::word LocalVarDescriptors_InstanceSize =
@@ -2366,7 +2366,7 @@ static constexpr dart::compiler::target::word Integer_InstanceSize = 4;
23662366
static constexpr dart::compiler::target::word KernelProgramInfo_InstanceSize =
23672367
64;
23682368
static constexpr dart::compiler::target::word LanguageError_InstanceSize = 28;
2369-
static constexpr dart::compiler::target::word Library_InstanceSize = 80;
2369+
static constexpr dart::compiler::target::word Library_InstanceSize = 76;
23702370
static constexpr dart::compiler::target::word LibraryPrefix_InstanceSize = 20;
23712371
static constexpr dart::compiler::target::word LinkedHashMap_InstanceSize = 28;
23722372
static constexpr dart::compiler::target::word LocalVarDescriptors_InstanceSize =
@@ -2845,7 +2845,7 @@ static constexpr dart::compiler::target::word Integer_InstanceSize = 8;
28452845
static constexpr dart::compiler::target::word KernelProgramInfo_InstanceSize =
28462846
128;
28472847
static constexpr dart::compiler::target::word LanguageError_InstanceSize = 48;
2848-
static constexpr dart::compiler::target::word Library_InstanceSize = 152;
2848+
static constexpr dart::compiler::target::word Library_InstanceSize = 144;
28492849
static constexpr dart::compiler::target::word LibraryPrefix_InstanceSize = 40;
28502850
static constexpr dart::compiler::target::word LinkedHashMap_InstanceSize = 56;
28512851
static constexpr dart::compiler::target::word LocalVarDescriptors_InstanceSize =
@@ -3316,7 +3316,7 @@ static constexpr dart::compiler::target::word Integer_InstanceSize = 4;
33163316
static constexpr dart::compiler::target::word KernelProgramInfo_InstanceSize =
33173317
64;
33183318
static constexpr dart::compiler::target::word LanguageError_InstanceSize = 28;
3319-
static constexpr dart::compiler::target::word Library_InstanceSize = 80;
3319+
static constexpr dart::compiler::target::word Library_InstanceSize = 76;
33203320
static constexpr dart::compiler::target::word LibraryPrefix_InstanceSize = 20;
33213321
static constexpr dart::compiler::target::word LinkedHashMap_InstanceSize = 28;
33223322
static constexpr dart::compiler::target::word LocalVarDescriptors_InstanceSize =
@@ -3796,7 +3796,7 @@ static constexpr dart::compiler::target::word Integer_InstanceSize = 8;
37963796
static constexpr dart::compiler::target::word KernelProgramInfo_InstanceSize =
37973797
128;
37983798
static constexpr dart::compiler::target::word LanguageError_InstanceSize = 48;
3799-
static constexpr dart::compiler::target::word Library_InstanceSize = 152;
3799+
static constexpr dart::compiler::target::word Library_InstanceSize = 144;
38003800
static constexpr dart::compiler::target::word LibraryPrefix_InstanceSize = 40;
38013801
static constexpr dart::compiler::target::word LinkedHashMap_InstanceSize = 56;
38023802
static constexpr dart::compiler::target::word LocalVarDescriptors_InstanceSize =
@@ -4307,7 +4307,7 @@ static constexpr dart::compiler::target::word
43074307
AOT_KernelProgramInfo_InstanceSize = 64;
43084308
static constexpr dart::compiler::target::word AOT_LanguageError_InstanceSize =
43094309
28;
4310-
static constexpr dart::compiler::target::word AOT_Library_InstanceSize = 76;
4310+
static constexpr dart::compiler::target::word AOT_Library_InstanceSize = 72;
43114311
static constexpr dart::compiler::target::word AOT_LibraryPrefix_InstanceSize =
43124312
20;
43134313
static constexpr dart::compiler::target::word AOT_LinkedHashMap_InstanceSize =
@@ -4833,7 +4833,7 @@ static constexpr dart::compiler::target::word
48334833
AOT_KernelProgramInfo_InstanceSize = 128;
48344834
static constexpr dart::compiler::target::word AOT_LanguageError_InstanceSize =
48354835
48;
4836-
static constexpr dart::compiler::target::word AOT_Library_InstanceSize = 144;
4836+
static constexpr dart::compiler::target::word AOT_Library_InstanceSize = 136;
48374837
static constexpr dart::compiler::target::word AOT_LibraryPrefix_InstanceSize =
48384838
40;
48394839
static constexpr dart::compiler::target::word AOT_LinkedHashMap_InstanceSize =
@@ -5363,7 +5363,7 @@ static constexpr dart::compiler::target::word
53635363
AOT_KernelProgramInfo_InstanceSize = 128;
53645364
static constexpr dart::compiler::target::word AOT_LanguageError_InstanceSize =
53655365
48;
5366-
static constexpr dart::compiler::target::word AOT_Library_InstanceSize = 144;
5366+
static constexpr dart::compiler::target::word AOT_Library_InstanceSize = 136;
53675367
static constexpr dart::compiler::target::word AOT_LibraryPrefix_InstanceSize =
53685368
40;
53695369
static constexpr dart::compiler::target::word AOT_LinkedHashMap_InstanceSize =
@@ -5880,7 +5880,7 @@ static constexpr dart::compiler::target::word
58805880
AOT_KernelProgramInfo_InstanceSize = 64;
58815881
static constexpr dart::compiler::target::word AOT_LanguageError_InstanceSize =
58825882
28;
5883-
static constexpr dart::compiler::target::word AOT_Library_InstanceSize = 76;
5883+
static constexpr dart::compiler::target::word AOT_Library_InstanceSize = 72;
58845884
static constexpr dart::compiler::target::word AOT_LibraryPrefix_InstanceSize =
58855885
20;
58865886
static constexpr dart::compiler::target::word AOT_LinkedHashMap_InstanceSize =
@@ -6399,7 +6399,7 @@ static constexpr dart::compiler::target::word
63996399
AOT_KernelProgramInfo_InstanceSize = 128;
64006400
static constexpr dart::compiler::target::word AOT_LanguageError_InstanceSize =
64016401
48;
6402-
static constexpr dart::compiler::target::word AOT_Library_InstanceSize = 144;
6402+
static constexpr dart::compiler::target::word AOT_Library_InstanceSize = 136;
64036403
static constexpr dart::compiler::target::word AOT_LibraryPrefix_InstanceSize =
64046404
40;
64056405
static constexpr dart::compiler::target::word AOT_LinkedHashMap_InstanceSize =
@@ -6922,7 +6922,7 @@ static constexpr dart::compiler::target::word
69226922
AOT_KernelProgramInfo_InstanceSize = 128;
69236923
static constexpr dart::compiler::target::word AOT_LanguageError_InstanceSize =
69246924
48;
6925-
static constexpr dart::compiler::target::word AOT_Library_InstanceSize = 144;
6925+
static constexpr dart::compiler::target::word AOT_Library_InstanceSize = 136;
69266926
static constexpr dart::compiler::target::word AOT_LibraryPrefix_InstanceSize =
69276927
40;
69286928
static constexpr dart::compiler::target::word AOT_LinkedHashMap_InstanceSize =

‎runtime/vm/kernel_loader.cc

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,7 +1305,6 @@ void KernelLoader::LoadLibraryImportsAndExports(Library* library,
13051305
LibraryPrefix& library_prefix = LibraryPrefix::Handle(Z);
13061306

13071307
const intptr_t deps_count = helper_.ReadListLength();
1308-
const Array& deps = Array::Handle(Array::New(deps_count));
13091308
for (intptr_t dep = 0; dep < deps_count; ++dep) {
13101309
LibraryDependencyHelper dependency_helper(&helper_);
13111310

@@ -1389,21 +1388,12 @@ void KernelLoader::LoadLibraryImportsAndExports(Library* library,
13891388
}
13901389
}
13911390
}
1392-
13931391
if (FLAG_enable_mirrors && dependency_helper.annotation_count_ > 0) {
13941392
ASSERT(annotations_kernel_offset > 0);
13951393
ns.AddMetadata(toplevel_class, TokenPosition::kNoSource,
13961394
annotations_kernel_offset);
13971395
}
1398-
1399-
if (prefix.IsNull()) {
1400-
deps.SetAt(dep, ns);
1401-
} else {
1402-
deps.SetAt(dep, library_prefix);
1403-
}
14041396
}
1405-
1406-
library->set_dependencies(deps);
14071397
}
14081398

14091399
void KernelLoader::LoadPreliminaryClass(ClassHelper* class_helper,

‎runtime/vm/object.cc

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11047,6 +11047,27 @@ void ClassDictionaryIterator::MoveToNextClass() {
1104711047
}
1104811048
}
1104911049

11050+
LibraryPrefixIterator::LibraryPrefixIterator(const Library& library)
11051+
: DictionaryIterator(library) {
11052+
Advance();
11053+
}
11054+
11055+
LibraryPrefixPtr LibraryPrefixIterator::GetNext() {
11056+
ASSERT(HasNext());
11057+
int ix = next_ix_++;
11058+
Object& obj = Object::Handle(array_.At(ix));
11059+
Advance();
11060+
return LibraryPrefix::Cast(obj).raw();
11061+
}
11062+
11063+
void LibraryPrefixIterator::Advance() {
11064+
Object& obj = Object::Handle(array_.At(next_ix_));
11065+
while (!obj.IsLibraryPrefix() && HasNext()) {
11066+
next_ix_++;
11067+
obj = array_.At(next_ix_);
11068+
}
11069+
}
11070+
1105011071
static void ReportTooManyImports(const Library& lib) {
1105111072
const String& url = String::Handle(lib.url());
1105211073
Report::MessageF(Report::kError, Script::Handle(lib.LookupScript(url)),
@@ -12020,10 +12041,6 @@ void Library::set_toplevel_class(const Class& value) const {
1202012041
StorePointer(&raw_ptr()->toplevel_class_, value.raw());
1202112042
}
1202212043

12023-
void Library::set_dependencies(const Array& deps) const {
12024-
StorePointer(&raw_ptr()->dependencies_, deps.raw());
12025-
}
12026-
1202712044
void Library::set_metadata(const GrowableObjectArray& value) const {
1202812045
StorePointer(&raw_ptr()->metadata_, value.raw());
1202912046
}
@@ -12892,7 +12909,6 @@ LibraryPrefixPtr LibraryPrefix::New(const String& name,
1289212909
result.set_num_imports(0);
1289312910
result.set_importer(importer);
1289412911
result.StoreNonPointer(&result.raw_ptr()->is_deferred_load_, deferred_load);
12895-
result.StoreNonPointer(&result.raw_ptr()->is_loaded_, false);
1289612912
result.set_imports(Array::Handle(Array::New(kInitialSize)));
1289712913
result.AddImport(import);
1289812914
return result.raw();
@@ -12920,7 +12936,8 @@ void LibraryPrefix::set_importer(const Library& value) const {
1292012936

1292112937
const char* LibraryPrefix::ToCString() const {
1292212938
const String& prefix = String::Handle(name());
12923-
return prefix.ToCString();
12939+
return OS::SCreate(Thread::Current()->zone(), "LibraryPrefix:'%s'",
12940+
prefix.ToCString());
1292412941
}
1292512942

1292612943
void Namespace::set_metadata_field(const Field& value) const {

‎runtime/vm/object.h

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4519,6 +4519,7 @@ class DictionaryIterator : public ValueObject {
45194519
int next_ix_; // Index of next element.
45204520

45214521
friend class ClassDictionaryIterator;
4522+
friend class LibraryPrefixIterator;
45224523
DISALLOW_COPY_AND_ASSIGN(DictionaryIterator);
45234524
};
45244525

@@ -4549,6 +4550,16 @@ class ClassDictionaryIterator : public DictionaryIterator {
45494550
DISALLOW_COPY_AND_ASSIGN(ClassDictionaryIterator);
45504551
};
45514552

4553+
class LibraryPrefixIterator : public DictionaryIterator {
4554+
public:
4555+
explicit LibraryPrefixIterator(const Library& library);
4556+
LibraryPrefixPtr GetNext();
4557+
4558+
private:
4559+
void Advance();
4560+
DISALLOW_COPY_AND_ASSIGN(LibraryPrefixIterator);
4561+
};
4562+
45524563
class Library : public Object {
45534564
public:
45544565
StringPtr name() const { return raw_ptr()->name_; }
@@ -4703,9 +4714,6 @@ class Library : public Object {
47034714
NamespacePtr ImportAt(intptr_t index) const;
47044715
LibraryPtr ImportLibraryAt(intptr_t index) const;
47054716

4706-
ArrayPtr dependencies() const { return raw_ptr()->dependencies_; }
4707-
void set_dependencies(const Array& deps) const;
4708-
47094717
void DropDependenciesAndCaches() const;
47104718

47114719
// Resolving native methods for script loaded in the library.
@@ -7311,10 +7319,6 @@ class LibraryPrefix : public Instance {
73117319
void AddImport(const Namespace& import) const;
73127320

73137321
bool is_deferred_load() const { return raw_ptr()->is_deferred_load_; }
7314-
bool is_loaded() const { return raw_ptr()->is_loaded_; }
7315-
void set_is_loaded(bool value) const {
7316-
return StoreNonPointer(&raw_ptr()->is_loaded_, value);
7317-
}
73187322

73197323
static intptr_t InstanceSize() {
73207324
return RoundedAllocationSize(sizeof(LibraryPrefixLayout));

‎runtime/vm/raw_object.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,12 +1305,11 @@ class LibraryLayout : public ObjectLayout {
13051305
GrowableObjectArrayPtr used_scripts_;
13061306
ArrayPtr imports_; // List of Namespaces imported without prefix.
13071307
ArrayPtr exports_; // List of re-exported Namespaces.
1308-
ArrayPtr dependencies_;
13091308
ExternalTypedDataPtr kernel_data_;
13101309
ObjectPtr* to_snapshot(Snapshot::Kind kind) {
13111310
switch (kind) {
13121311
case Snapshot::kFullAOT:
1313-
return reinterpret_cast<ObjectPtr*>(&dependencies_);
1312+
return reinterpret_cast<ObjectPtr*>(&exports_);
13141313
case Snapshot::kFull:
13151314
case Snapshot::kFullJIT:
13161315
return reinterpret_cast<ObjectPtr*>(&kernel_data_);
@@ -2131,7 +2130,6 @@ class LibraryPrefixLayout : public InstanceLayout {
21312130
}
21322131
uint16_t num_imports_; // Number of library entries in libraries_.
21332132
bool is_deferred_load_;
2134-
bool is_loaded_;
21352133
};
21362134

21372135
class TypeArgumentsLayout : public InstanceLayout {

‎runtime/vm/symbols.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ class ObjectPointerVisitor;
4444
V(Call, "call") \
4545
V(Cancel, "cancel") \
4646
V(CastError, "_CastError") \
47-
V(CheckLoaded, "_checkLoaded") \
4847
V(Class, "Class") \
4948
V(ClassID, "ClassID") \
5049
V(ClearAsyncThreadStackTrace, "_clearAsyncThreadStackTrace") \
@@ -206,7 +205,6 @@ class ObjectPointerVisitor;
206205
V(ListFactory, "List.") \
207206
V(ListFilledFactory, "List.filled") \
208207
V(ListLiteralFactory, "List._fromLiteral") \
209-
V(LoadLibrary, "_loadLibrary") \
210208
V(LocalVarDescriptors, "LocalVarDescriptors") \
211209
V(Map, "Map") \
212210
V(MapLiteralFactory, "Map._fromLiteral") \

0 commit comments

Comments
 (0)