Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tests/compiler/dart2js/no_such_method_enabled_test.dart

Issue 2857943002: Implement KernelNoSuchMethodResolver. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« pkg/compiler/lib/src/kernel/no_such_method_resolver.dart ('K') | « tests/compiler/dart2js/kernel/compiler_helper.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/compiler/dart2js/no_such_method_enabled_test.dart
diff --git a/tests/compiler/dart2js/no_such_method_enabled_test.dart b/tests/compiler/dart2js/no_such_method_enabled_test.dart
index 4beeeb291dc9c470110b9daaa4cf267945dea938..0944c020f9b26ae5903dde60c006aa73fdcd8992 100644
--- a/tests/compiler/dart2js/no_such_method_enabled_test.dart
+++ b/tests/compiler/dart2js/no_such_method_enabled_test.dart
@@ -3,12 +3,51 @@
// BSD-style license that can be found in the LICENSE file.
import 'dart:async';
-import 'package:expect/expect.dart';
import 'package:async_helper/async_helper.dart';
+import 'package:compiler/src/common_elements.dart';
+import 'package:compiler/src/compiler.dart';
+import 'package:compiler/src/elements/entities.dart';
+import 'package:compiler/src/js_backend/no_such_method_registry.dart';
+import 'package:expect/expect.dart';
+import 'kernel/compiler_helper.dart';
import 'compiler_helper.dart';
-Future dummyImplTest() async {
- String source = """
+class NoSuchMethodInfo {
+ final String className;
+ final String superClassName;
+ final bool hasThrowingSyntax;
+ final bool hasForwardingSyntax;
+ final bool isThrowing;
+ final bool isDefault;
+ final bool isOther;
+ final bool isNotApplicable;
+ final bool isComplexNoReturn;
+ final bool isComplexReturn;
+
+ const NoSuchMethodInfo(this.className,
+ {this.superClassName,
+ this.hasThrowingSyntax: false,
+ this.hasForwardingSyntax: false,
+ this.isThrowing: false,
+ this.isDefault: false,
+ this.isOther: false,
+ this.isNotApplicable: false,
+ this.isComplexNoReturn: false,
+ this.isComplexReturn: false});
+}
+
+class NoSuchMethodTest {
+ final String code;
+ final List<NoSuchMethodInfo> methods;
+ final bool isNoSuchMethodUsed;
+
+ const NoSuchMethodTest(this.code, this.methods,
+ {this.isNoSuchMethodUsed: false});
+}
+
+const List<NoSuchMethodTest> TESTS = const <NoSuchMethodTest>[
+ const NoSuchMethodTest(
+ """
class A {
foo() => 3;
noSuchMethod(x) => super.noSuchMethod(x);
@@ -16,18 +55,12 @@ class A {
main() {
print(new A().foo());
}
-""";
- Uri uri = new Uri(scheme: 'source');
- var compiler = compilerFor(source, uri);
- await compiler.run(uri);
- Expect.isFalse(compiler.backend.backendUsage.isNoSuchMethodUsed);
- ClassElement clsA = findElement(compiler, 'A');
- Expect.isTrue(compiler.backend.noSuchMethodRegistry.defaultImpls
- .contains(clsA.lookupMember('noSuchMethod')));
-}
-
-Future dummyImplTest2() async {
- String source = """
+""",
+ const <NoSuchMethodInfo>[
+ const NoSuchMethodInfo('A', hasForwardingSyntax: true, isDefault: true),
+ ]),
+ const NoSuchMethodTest(
+ """
class A extends B {
foo() => 3;
noSuchMethod(x) => super.noSuchMethod(x);
@@ -36,18 +69,12 @@ class B {}
main() {
print(new A().foo());
}
-""";
- Uri uri = new Uri(scheme: 'source');
- var compiler = compilerFor(source, uri);
- await compiler.run(uri);
- Expect.isFalse(compiler.backend.backendUsage.isNoSuchMethodUsed);
- ClassElement clsA = findElement(compiler, 'A');
- Expect.isTrue(compiler.backend.noSuchMethodRegistry.defaultImpls
- .contains(clsA.lookupMember('noSuchMethod')));
-}
-
-Future dummyImplTest3() async {
- String source = """
+""",
+ const <NoSuchMethodInfo>[
+ const NoSuchMethodInfo('A', hasForwardingSyntax: true, isDefault: true),
+ ]),
+ const NoSuchMethodTest(
+ """
class A extends B {
foo() => 3;
noSuchMethod(x) {
@@ -58,18 +85,12 @@ class B {}
main() {
print(new A().foo());
}
-""";
- Uri uri = new Uri(scheme: 'source');
- var compiler = compilerFor(source, uri);
- await compiler.run(uri);
- Expect.isFalse(compiler.backend.backendUsage.isNoSuchMethodUsed);
- ClassElement clsA = findElement(compiler, 'A');
- Expect.isTrue(compiler.backend.noSuchMethodRegistry.defaultImpls
- .contains(clsA.lookupMember('noSuchMethod')));
-}
-
-Future dummyImplTest4() async {
- String source = """
+""",
+ const <NoSuchMethodInfo>[
+ const NoSuchMethodInfo('A', hasForwardingSyntax: true, isDefault: true),
+ ]),
+ const NoSuchMethodTest(
+ """
class A extends B {
foo() => 3;
noSuchMethod(x) => super.noSuchMethod(x);
@@ -80,21 +101,14 @@ class B {
main() {
print(new A().foo());
}
-""";
- Uri uri = new Uri(scheme: 'source');
- var compiler = compilerFor(source, uri);
- await compiler.run(uri);
- Expect.isFalse(compiler.backend.backendUsage.isNoSuchMethodUsed);
- ClassElement clsA = findElement(compiler, 'A');
- Expect.isTrue(compiler.backend.noSuchMethodRegistry.defaultImpls
- .contains(clsA.lookupMember('noSuchMethod')));
- ClassElement clsB = findElement(compiler, 'B');
- Expect.isTrue(compiler.backend.noSuchMethodRegistry.defaultImpls
- .contains(clsB.lookupMember('noSuchMethod')));
-}
-
-Future dummyImplTest5() async {
- String source = """
+""",
+ const <NoSuchMethodInfo>[
+ const NoSuchMethodInfo('A',
+ superClassName: 'B', hasForwardingSyntax: true, isDefault: true),
+ const NoSuchMethodInfo('B', hasForwardingSyntax: true, isDefault: true),
+ ]),
+ const NoSuchMethodTest(
+ """
class A extends B {
foo() => 3;
noSuchMethod(x) => super.noSuchMethod(x);
@@ -105,93 +119,66 @@ class B {
main() {
print(new A().foo());
}
-""";
- Uri uri = new Uri(scheme: 'source');
- var compiler = compilerFor(source, uri);
- await compiler.run(uri);
- Expect.isTrue(compiler.backend.backendUsage.isNoSuchMethodUsed);
- ClassElement clsA = findElement(compiler, 'A');
- Expect.isTrue(compiler.backend.noSuchMethodRegistry.throwingImpls
- .contains(clsA.lookupMember('noSuchMethod')));
- ClassElement clsB = findElement(compiler, 'B');
- Expect.isTrue(compiler.backend.noSuchMethodRegistry.throwingImpls
- .contains(clsB.lookupMember('noSuchMethod')));
-}
-
-Future dummyImplTest6() async {
- String source = """
+""",
+ const <NoSuchMethodInfo>[
+ const NoSuchMethodInfo('A',
+ superClassName: 'B', hasForwardingSyntax: true, isThrowing: true),
+ const NoSuchMethodInfo('B', hasThrowingSyntax: true, isThrowing: true),
+ ],
+ isNoSuchMethodUsed: true),
+ const NoSuchMethodTest(
+ """
class A {
noSuchMethod(x) => 3;
}
main() {
print(new A().foo());
}
-""";
- Uri uri = new Uri(scheme: 'source');
- var compiler = compilerFor(source, uri);
- await compiler.run(uri);
- Expect.isTrue(compiler.backend.backendUsage.isNoSuchMethodUsed);
- ClassElement clsA = findElement(compiler, 'A');
- Expect.isTrue(compiler.backend.noSuchMethodRegistry.otherImpls
- .contains(clsA.lookupMember('noSuchMethod')));
-}
-
-Future dummyImplTest7() async {
- String source = """
+""",
+ const <NoSuchMethodInfo>[
+ const NoSuchMethodInfo('A', isOther: true, isComplexReturn: true),
+ ],
+ isNoSuchMethodUsed: true),
+ const NoSuchMethodTest(
+ """
class A {
noSuchMethod(x, [y]) => super.noSuchMethod(x);
}
main() {
print(new A().foo());
}
-""";
- Uri uri = new Uri(scheme: 'source');
- var compiler = compilerFor(source, uri);
- await compiler.run(uri);
- Expect.isFalse(compiler.backend.backendUsage.isNoSuchMethodUsed);
- ClassElement clsA = findElement(compiler, 'A');
- Expect.isTrue(compiler.backend.noSuchMethodRegistry.defaultImpls
- .contains(clsA.lookupMember('noSuchMethod')));
-}
-
-Future dummyImplTest8() async {
- String source = """
+""",
+ const <NoSuchMethodInfo>[
+ const NoSuchMethodInfo('A', hasForwardingSyntax: true, isDefault: true),
+ ]),
+ const NoSuchMethodTest(
+ """
class A {
noSuchMethod(x, [y]) => super.noSuchMethod(x, y);
}
main() {
print(new A().foo());
}
-""";
- Uri uri = new Uri(scheme: 'source');
- var compiler = compilerFor(source, uri);
- await compiler.run(uri);
- Expect.isTrue(compiler.backend.backendUsage.isNoSuchMethodUsed);
- ClassElement clsA = findElement(compiler, 'A');
- Expect.isTrue(compiler.backend.noSuchMethodRegistry.otherImpls
- .contains(clsA.lookupMember('noSuchMethod')));
-}
-
-Future dummyImplTest9() async {
- String source = """
+""",
+ const <NoSuchMethodInfo>[
+ const NoSuchMethodInfo('A', isOther: true, isComplexNoReturn: true),
+ ],
+ isNoSuchMethodUsed: true),
+ const NoSuchMethodTest(
+ """
class A {
noSuchMethod(x, y) => super.noSuchMethod(x);
}
main() {
print(new A().foo());
}
-""";
- Uri uri = new Uri(scheme: 'source');
- var compiler = compilerFor(source, uri);
- await compiler.run(uri);
- Expect.isFalse(compiler.backend.backendUsage.isNoSuchMethodUsed);
- ClassElement clsA = findElement(compiler, 'A');
- Expect.isTrue(compiler.backend.noSuchMethodRegistry.notApplicableImpls
- .contains(clsA.lookupMember('noSuchMethod')));
-}
-
-Future dummyImplTest10() async {
- String source = """
+""",
+ const <NoSuchMethodInfo>[
+ const NoSuchMethodInfo('A',
+ hasForwardingSyntax: true, isNotApplicable: true),
+ ]),
+ const NoSuchMethodTest(
+ """
class A {
noSuchMethod(Invocation x) {
throw new UnsupportedException();
@@ -200,18 +187,13 @@ class A {
main() {
print(new A().foo());
}
-""";
- Uri uri = new Uri(scheme: 'source');
- var compiler = compilerFor(source, uri);
- await compiler.run(uri);
- Expect.isTrue(compiler.backend.backendUsage.isNoSuchMethodUsed);
- ClassElement clsA = findElement(compiler, 'A');
- Expect.isTrue(compiler.backend.noSuchMethodRegistry.throwingImpls
- .contains(clsA.lookupMember('noSuchMethod')));
-}
-
-Future dummyImplTest11() async {
- String source = """
+""",
+ const <NoSuchMethodInfo>[
+ const NoSuchMethodInfo('A', hasThrowingSyntax: true, isThrowing: true),
+ ],
+ isNoSuchMethodUsed: true),
+ const NoSuchMethodTest(
+ """
class A {
noSuchMethod(Invocation x) {
print('foo');
@@ -221,20 +203,13 @@ class A {
main() {
print(new A().foo());
}
-""";
- Uri uri = new Uri(scheme: 'source');
- var compiler = compilerFor(source, uri);
- await compiler.run(uri);
- Expect.isTrue(compiler.backend.backendUsage.isNoSuchMethodUsed);
- ClassElement clsA = findElement(compiler, 'A');
- Expect.isTrue(compiler.backend.noSuchMethodRegistry.otherImpls
- .contains(clsA.lookupMember('noSuchMethod')));
- Expect.isTrue(compiler.backend.noSuchMethodRegistry.complexNoReturnImpls
- .contains(clsA.lookupMember('noSuchMethod')));
-}
-
-Future dummyImplTest12() async {
- String source = """
+""",
+ const <NoSuchMethodInfo>[
+ const NoSuchMethodInfo('A', isOther: true, isComplexNoReturn: true),
+ ],
+ isNoSuchMethodUsed: true),
+ const NoSuchMethodTest(
+ """
class A {
noSuchMethod(Invocation x) {
return toString();
@@ -243,50 +218,134 @@ class A {
main() {
print(new A().foo());
}
-""";
- Uri uri = new Uri(scheme: 'source');
- var compiler = compilerFor(source, uri);
- await compiler.run(uri);
- Expect.isTrue(compiler.backend.backendUsage.isNoSuchMethodUsed);
- ClassElement clsA = findElement(compiler, 'A');
- Expect.isTrue(compiler.backend.noSuchMethodRegistry.otherImpls
- .contains(clsA.lookupMember('noSuchMethod')));
- Expect.isTrue(compiler.backend.noSuchMethodRegistry.complexReturningImpls
- .contains(clsA.lookupMember('noSuchMethod')));
-}
-
-Future dummyImplTest13() async {
- String source = """
+""",
+ const <NoSuchMethodInfo>[
+ const NoSuchMethodInfo('A', isOther: true, isComplexReturn: true),
+ ],
+ isNoSuchMethodUsed: true),
+ const NoSuchMethodTest(
+ """
class A {
noSuchMethod(x) => super.noSuchMethod(x) as dynamic;
}
main() {
print(new A().foo());
}
-""";
- Uri uri = new Uri(scheme: 'source');
- var compiler = compilerFor(source, uri);
- await compiler.run(uri);
- Expect.isFalse(compiler.backend.backendUsage.isNoSuchMethodUsed);
- ClassElement clsA = findElement(compiler, 'A');
- Expect.isTrue(compiler.backend.noSuchMethodRegistry.defaultImpls
- .contains(clsA.lookupMember('noSuchMethod')));
-}
+""",
+ const <NoSuchMethodInfo>[
+ const NoSuchMethodInfo('A', hasForwardingSyntax: true, isDefault: true),
+ ]),
+];
main() {
asyncTest(() async {
- await dummyImplTest();
- await dummyImplTest2();
- await dummyImplTest3();
- await dummyImplTest4();
- await dummyImplTest5();
- await dummyImplTest6();
- await dummyImplTest7();
- await dummyImplTest8();
- await dummyImplTest9();
- await dummyImplTest10();
- await dummyImplTest11();
- await dummyImplTest12();
- await dummyImplTest13();
+ for (NoSuchMethodTest test in TESTS) {
+ print('---- testing -------------------------------------------------');
+ print(test.code);
+ Uri uri = new Uri(scheme: 'source');
+ Compiler compiler = compilerFor(test.code, uri);
+ await compiler.run(uri);
+ checkTest(compiler, test, testComplexReturns: true);
+ }
+
+ List<String> sources = <String>[];
+ for (NoSuchMethodTest test in TESTS) {
+ sources.add(test.code);
+ }
+
+ print('---- preparing for kernel tests ----------------------------------');
+ List<CompileFunction> results = await compileMultiple(sources);
+ for (int index = 0; index < results.length; index++) {
+ print('---- testing with kernel --------------------------------------');
+ print(sources[index]);
+ Compiler compiler = await results[index]();
+ // Complex returns are computed during inference.
+ checkTest(compiler, TESTS[index], testComplexReturns: false);
+ }
});
}
+
+checkTest(Compiler compiler, NoSuchMethodTest test, {bool testComplexReturns}) {
+ ElementEnvironment elementEnvironment = compiler.elementEnvironment;
+ NoSuchMethodRegistry registry = compiler.backend.noSuchMethodRegistry;
+ NoSuchMethodResolver resolver = registry.resolver;
Siggi Cherem (dart-lang) 2017/05/03 17:29:49 nit: rather than making the resolver public, I'd k
Johnni Winther 2017/05/04 09:13:36 Done.
+ FunctionEntity noSuchMethodObject = elementEnvironment.lookupClassMember(
Siggi Cherem (dart-lang) 2017/05/03 17:29:49 nit: noSuchMethodInObject or ObjectNSM or defaultN
Johnni Winther 2017/05/04 09:13:36 Done.
+ compiler.commonElements.objectClass, 'noSuchMethod');
+
+ // Test [NoSuchMethodResolver] results for each method.
+ for (NoSuchMethodInfo info in test.methods) {
+ ClassEntity cls =
+ elementEnvironment.lookupClass(compiler.mainApp, info.className);
+ Expect.isNotNull(cls, "Class ${info.className} not found.");
+ FunctionEntity noSuchMethod =
+ elementEnvironment.lookupClassMember(cls, 'noSuchMethod');
+ Expect.isNotNull(noSuchMethod, "noSuchMethod not found in $cls.");
+
+ if (info.superClassName == null) {
+ Expect.equals(
+ noSuchMethodObject, resolver.getSuperNoSuchMethod(noSuchMethod));
+ } else {
+ ClassEntity superclass =
+ elementEnvironment.lookupClass(compiler.mainApp, info.superClassName);
+ Expect.isNotNull(
+ superclass, "Superclass ${info.superClassName} not found.");
+ FunctionEntity superNoSuchMethod =
+ elementEnvironment.lookupClassMember(superclass, 'noSuchMethod');
+ Expect.isNotNull(
+ superNoSuchMethod, "noSuchMethod not found in $superclass.");
+ Expect.equals(
+ superNoSuchMethod,
+ resolver.getSuperNoSuchMethod(noSuchMethod),
+ "Unexpected super noSuchMethod for $noSuchMethod.");
+ }
+
+ Expect.equals(
+ info.hasForwardingSyntax,
+ resolver.hasForwardingSyntax(noSuchMethod),
+ "Unexpected hasForwardSyntax result on $noSuchMethod.");
+ Expect.equals(
+ info.hasThrowingSyntax,
+ resolver.hasThrowingSyntax(noSuchMethod),
+ "Unexpected hasThrowingSyntax result on $noSuchMethod.");
+ }
+
+ // Test [NoSuchMethodRegistry] results for each method. These are based on
+ // the [NoSuchMethodResolver] results which are therefore tested for all
+ // methods first.
+ for (NoSuchMethodInfo info in test.methods) {
+ ClassEntity cls =
+ elementEnvironment.lookupClass(compiler.mainApp, info.className);
+ Expect.isNotNull(cls, "Class ${info.className} not found.");
+ FunctionEntity noSuchMethod =
+ elementEnvironment.lookupClassMember(cls, 'noSuchMethod');
+ Expect.isNotNull(noSuchMethod, "noSuchMethod not found in $cls.");
+
+ Expect.equals(info.isDefault, registry.defaultImpls.contains(noSuchMethod),
+ "Unexpected isDefault result on $noSuchMethod.");
+ Expect.equals(
+ info.isThrowing,
+ registry.throwingImpls.contains(noSuchMethod),
+ "Unexpected isThrowing result on $noSuchMethod.");
+ Expect.equals(info.isOther, registry.otherImpls.contains(noSuchMethod),
+ "Unexpected isOther result on $noSuchMethod.");
+ Expect.equals(
+ info.isNotApplicable,
+ registry.notApplicableImpls.contains(noSuchMethod),
+ "Unexpected isNotApplicable result on $noSuchMethod.");
+ if (testComplexReturns) {
+ Expect.equals(
+ info.isComplexNoReturn,
+ registry.complexNoReturnImpls.contains(noSuchMethod),
+ "Unexpected isComplexNoReturn result on $noSuchMethod.");
+ Expect.equals(
+ info.isComplexReturn,
+ registry.complexReturningImpls.contains(noSuchMethod),
+ "Unexpected isComplexReturn result on $noSuchMethod.");
+ }
+ }
+
+ Expect.equals(
+ test.isNoSuchMethodUsed,
+ compiler.backend.backendUsage.isNoSuchMethodUsed,
+ "Unexpected isNoSuchMethodUsed result.");
+}
« pkg/compiler/lib/src/kernel/no_such_method_resolver.dart ('K') | « tests/compiler/dart2js/kernel/compiler_helper.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698