Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 85d5812

Browse files
committed
Port type_representation_test to work with kernel
Change-Id: Icfc60f741fd00386d781c1d6dd1a4b874478a1fb Reviewed-on: https://dart-review.googlesource.com/48601 Reviewed-by: Sigmund Cherem <sigmund@google.com>
1 parent 8504808 commit 85d5812

File tree

6 files changed

+341
-297
lines changed

6 files changed

+341
-297
lines changed
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file
2+
// for details. All rights reserved. Use of this source code is governed by a
3+
// BSD-style license that can be found in the LICENSE file.
4+
5+
import 'package:compiler/src/common_elements.dart' show ElementEnvironment;
6+
import 'package:compiler/src/elements/entities.dart';
7+
import 'package:compiler/src/elements/types.dart';
8+
import 'package:compiler/src/world.dart' show ClosedWorld;
9+
10+
ClassEntity findClass(ClosedWorld closedWorld, String name) {
11+
ElementEnvironment elementEnvironment = closedWorld.elementEnvironment;
12+
ClassEntity cls =
13+
elementEnvironment.lookupClass(elementEnvironment.mainLibrary, name);
14+
cls ??= elementEnvironment.lookupClass(
15+
closedWorld.commonElements.coreLibrary, name);
16+
assert(cls != null, "Class '$name' not found.");
17+
return cls;
18+
}
19+
20+
MemberEntity findClassMember(
21+
ClosedWorld closedWorld, String className, String memberName) {
22+
ElementEnvironment elementEnvironment = closedWorld.elementEnvironment;
23+
ClassEntity cls = findClass(closedWorld, className);
24+
assert(cls != null, "Class '$className' not found.");
25+
MemberEntity member = elementEnvironment.lookupClassMember(cls, memberName);
26+
assert(member != null, "Member '$memberName' not found in $cls.");
27+
return member;
28+
}
29+
30+
MemberEntity findMember(ClosedWorld closedWorld, String name) {
31+
ElementEnvironment elementEnvironment = closedWorld.elementEnvironment;
32+
MemberEntity member = elementEnvironment.lookupLibraryMember(
33+
elementEnvironment.mainLibrary, name);
34+
member ??= elementEnvironment.lookupLibraryMember(
35+
closedWorld.commonElements.coreLibrary, name);
36+
assert(member != null, "Member '$name' not found.");
37+
return member;
38+
}
39+
40+
FunctionType findFunctionType(ClosedWorld closedWorld, String name) {
41+
FunctionEntity function = findMember(closedWorld, name);
42+
return closedWorld.elementEnvironment.getFunctionType(function);
43+
}
44+
45+
DartType findFieldType(ClosedWorld closedWorld, String name) {
46+
FieldEntity field = findMember(closedWorld, name);
47+
return closedWorld.elementEnvironment.getFieldType(field);
48+
}

tests/compiler/dart2js/inference/list_tracer_test.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import 'package:compiler/src/commandline_options.dart';
88
import 'package:expect/expect.dart';
99

1010
import 'type_mask_test_helper.dart';
11+
import '../helpers/element_lookup.dart';
1112
import '../memory_compiler.dart';
1213

1314
String generateTest(String listAllocation) {

tests/compiler/dart2js/inference/map_tracer_test.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import 'package:compiler/src/world.dart';
1212
import 'package:expect/expect.dart';
1313

1414
import 'type_mask_test_helper.dart';
15+
import '../helpers/element_lookup.dart';
1516
import '../memory_compiler.dart';
1617

1718
String generateTest(String mapAllocation) {

tests/compiler/dart2js/inference/type_mask_test_helper.dart

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44

55
library type_mask_test_helper;
66

7-
import 'package:compiler/src/common_elements.dart' show ElementEnvironment;
8-
import 'package:compiler/src/elements/entities.dart'
9-
show ClassEntity, MemberEntity;
107
import 'package:compiler/src/types/types.dart';
118
import 'package:compiler/src/world.dart' show ClosedWorld;
129

@@ -40,30 +37,3 @@ TypeMask interceptorOrComparable(ClosedWorld closedWorld,
4037
closedWorld);
4138
}
4239
}
43-
44-
ClassEntity findClass(ClosedWorld closedWorld, String name) {
45-
ElementEnvironment elementEnvironment = closedWorld.elementEnvironment;
46-
ClassEntity cls =
47-
elementEnvironment.lookupClass(elementEnvironment.mainLibrary, name);
48-
assert(cls != null, "Class '$name' not found.");
49-
return cls;
50-
}
51-
52-
MemberEntity findClassMember(
53-
ClosedWorld closedWorld, String className, String memberName) {
54-
ElementEnvironment elementEnvironment = closedWorld.elementEnvironment;
55-
ClassEntity cls =
56-
elementEnvironment.lookupClass(elementEnvironment.mainLibrary, className);
57-
assert(cls != null, "Class '$className' not found.");
58-
MemberEntity member = elementEnvironment.lookupClassMember(cls, memberName);
59-
assert(member != null, "Member '$memberName' not found in $cls.");
60-
return member;
61-
}
62-
63-
MemberEntity findMember(ClosedWorld closedWorld, String name) {
64-
ElementEnvironment elementEnvironment = closedWorld.elementEnvironment;
65-
MemberEntity member = elementEnvironment.lookupLibraryMember(
66-
elementEnvironment.mainLibrary, name);
67-
assert(member != null, "Member '$name' not found.");
68-
return member;
69-
}

0 commit comments

Comments
 (0)