Index: tests/compiler/dart2js/type_combination_test.dart |
diff --git a/tests/compiler/dart2js/type_combination_test.dart b/tests/compiler/dart2js/type_combination_test.dart |
index 5112fed1fa5c6ec223e3fd0f99cda2c049e3ef51..fb16be48c4f7ddba91908b7300e130d3f757446e 100644 |
--- a/tests/compiler/dart2js/type_combination_test.dart |
+++ b/tests/compiler/dart2js/type_combination_test.dart |
@@ -2033,17 +2033,25 @@ void testRegressions(MockCompiler compiler) { |
void main() { |
MockCompiler compiler = new MockCompiler(); |
+ compiler.interceptorsLibrary.forEachLocalMember((Element element) { |
+ if (element.isClass()) { |
+ compiler.enqueuer.resolution.registerInstantiatedClass(element); |
+ } |
+ }); |
+ compiler.world.populate(); |
+ |
nonPrimitive1 = new HType.nonNullSubtype( |
compiler.mapClass.computeType(compiler), compiler); |
nonPrimitive2 = new HType.nonNullSubtype( |
compiler.functionClass.computeType(compiler), compiler); |
- potentialArray = new HBoundedPotentialPrimitiveArray( |
+ potentialArray = new HBoundedType( |
new TypeMask.subtype(compiler.listClass.computeType(compiler))); |
potentialString = new HBoundedPotentialPrimitiveString( |
new TypeMask.subtype(compiler.stringClass.computeType(compiler))); |
jsArrayOrNull = new HType.fromMask( |
new TypeMask.exact(compiler.backend.jsArrayClass.computeType(compiler)), |
compiler); |
+ |
testUnion(compiler); |
testIntersection(compiler); |
testRegressions(compiler); |