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

Unified Diff: pkg/kernel/testcases/closures/instance_tear_off.dart.expect

Issue 2891053003: Add support for converted closures with explicit contexts to VM (Closed)
Patch Set: Disable closure conversion in frontend (was enabled for testing) Created 3 years, 6 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
Index: pkg/kernel/testcases/closures/instance_tear_off.dart.expect
diff --git a/pkg/kernel/testcases/closures/instance_tear_off.dart.expect b/pkg/kernel/testcases/closures/instance_tear_off.dart.expect
index 740fa9626f37cb5d6ea668c0c6261a936a0e9c65..7243ded80fd299a91173eb6f96b458321e28d436 100644
--- a/pkg/kernel/testcases/closures/instance_tear_off.dart.expect
+++ b/pkg/kernel/testcases/closures/instance_tear_off.dart.expect
@@ -78,6 +78,19 @@ static method test(dynamic o) → dynamic {
self::expect("g(42)", o.g(42));
self::expect("g(42)", o.g.call(42));
self::expect("a", o.a());
+<<<<<<< HEAD
+ self::expect("a", o.a#get.call());
+ self::expect(42, o.b(42));
+ self::expect(42, o.b#get.call(42));
+ self::expect(42, o.c(40));
+ self::expect(42, o.c#get.call(40));
+ self::expect(87, o.c(80, 7));
+ self::expect(87, o.c#get.call(80, 7));
+ self::expect(42, o.d(40));
+ self::expect(42, o.d#get.call(40));
+ self::expect(87, o.d(80, y: 7));
+ self::expect(87, o.d#get.call(80, y: 7));
+=======
self::expect("a", o.a.call());
self::expect(42, o.b(42));
self::expect(42, o.b.call(42));
@@ -89,6 +102,7 @@ static method test(dynamic o) → dynamic {
self::expect(42, o.d.call(40));
self::expect(87, o.d(80, y: 7));
self::expect(87, o.d.call(80, y: 7));
+>>>>>>> master
}
static method main(dynamic arguments) → dynamic {
self::test(new self::C::•());

Powered by Google App Engine
This is Rietveld 408576698