From 683fe6ab7c1925cfb63f7b36a7ff6088e4ff937e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20von=20der=20Ah=C3=A9?= <ahe@google.com>
Date: Wed, 1 Feb 2017 13:32:42 +0100
Subject: [PATCH] Update rasta direct expectations.

R=karlklose@google.com

Review-Url: https://codereview.chromium.org/2658093007 .
---
 .../abstract_constructor.dart.direct.expect   |  7 ++--
 ...constructor_redirection.dart.direct.expect |  4 +--
 .../rasta/bad_continue.dart.direct.expect     |  2 +-
 ...licit_super_constructor.dart.direct.expect |  4 +--
 .../bad_setter_initializer.dart.direct.expect |  4 +--
 .../rasta/breaking_bad.dart.direct.expect     |  2 +-
 .../fasta/rasta/cascades.dart.direct.expect   |  5 +--
 .../rasta/class_member.dart.direct.expect     | 12 +++----
 .../rasta/deferred_load.dart.direct.expect    |  5 +--
 .../rasta/duplicated_mixin.dart.direct.expect | 32 +++++++++--------
 .../test/fasta/rasta/enum.dart.direct.expect  | 10 +++---
 ...nal_factory_redirection.dart.direct.expect |  2 +-
 .../rasta/generic_factory.dart.direct.expect  | 25 +++++++------
 .../rasta/issue_000001.dart.direct.expect     |  2 +-
 .../rasta/issue_000002.dart.direct.expect     |  8 ++---
 .../rasta/issue_000004.dart.direct.expect     |  6 ++--
 .../rasta/issue_000007.dart.direct.expect     | 24 +++++++------
 .../rasta/issue_000008.dart.direct.expect     |  2 +-
 .../rasta/issue_000012.dart.direct.expect     | 14 ++++----
 .../rasta/issue_000025.dart.direct.expect     |  2 +-
 .../rasta/issue_000026.dart.direct.expect     | 21 +++++------
 .../rasta/issue_000031.dart.direct.expect     |  2 +-
 .../rasta/issue_000034.dart.direct.expect     |  4 +--
 .../rasta/issue_000035.dart.direct.expect     |  3 +-
 .../rasta/issue_000043.dart.direct.expect     |  5 +--
 .../rasta/issue_000053.dart.direct.expect     |  7 ++--
 .../rasta/issue_000067.dart.direct.expect     | 19 +++++-----
 .../rasta/issue_000068.dart.direct.expect     | 34 ++++++++++--------
 .../rasta/issue_000069.dart.direct.expect     |  3 +-
 .../rasta/issue_000070.dart.direct.expect     | 30 ++++++++--------
 .../rasta/issue_000080.dart.direct.expect     | 27 +++++++-------
 .../rasta/issue_000081.dart.direct.expect     | 18 +++++-----
 .../malformed_function.dart.direct.expect     |  5 +--
 .../rasta/mixin_library.dart.direct.expect    | 15 ++++----
 .../super_initializer.dart.direct.expect      | 18 +++++-----
 .../rasta/super_operator.dart.direct.expect   | 19 +++++-----
 .../supports_reflection.dart.direct.expect    |  2 +-
 ...itch_execution_case_t02.dart.direct.expect |  4 ++-
 .../switch_fall_through.dart.direct.expect    | 36 +++++++++++--------
 .../rasta/this_invoke.dart.direct.expect      |  5 +--
 .../rasta/type_literals.dart.direct.expect    |  5 +--
 .../fasta/rasta/unresolved.dart.direct.expect |  2 +-
 .../unresolved_constructor.dart.direct.expect |  6 ++--
 43 files changed, 255 insertions(+), 207 deletions(-)

diff --git a/pkg/front_end/test/fasta/rasta/abstract_constructor.dart.direct.expect b/pkg/front_end/test/fasta/rasta/abstract_constructor.dart.direct.expect
index 94c244e375a..125bce0f475 100644
--- a/pkg/front_end/test/fasta/rasta/abstract_constructor.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/abstract_constructor.dart.direct.expect
@@ -3,9 +3,10 @@ import self as self;
 import "dart:core" as core;
 
 abstract class C extends core::Object {
-  constructor •() → self::C
-    : super core::Object::•();
+  constructor •() → void
+    : super core::Object::•()
+    ;
 }
 static method main() → dynamic {
-  invalid-expression;
+  throw new core::NoSuchMethodError::•(null, #C, <dynamic>[], <dynamic, dynamic>{}, null);
 }
diff --git a/pkg/front_end/test/fasta/rasta/bad_constructor_redirection.dart.direct.expect b/pkg/front_end/test/fasta/rasta/bad_constructor_redirection.dart.direct.expect
index 397cac6093f..76f08943dcc 100644
--- a/pkg/front_end/test/fasta/rasta/bad_constructor_redirection.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/bad_constructor_redirection.dart.direct.expect
@@ -3,9 +3,9 @@ import self as self;
 import "dart:core" as core;
 
 class C extends core::Object {
-  const constructor •() → dynamic
+  const constructor •() → void
     : invalid-initializer;
-  const constructor x() → dynamic
+  const constructor x() → void
     : super core::Object::•()
     ;
 }
diff --git a/pkg/front_end/test/fasta/rasta/bad_continue.dart.direct.expect b/pkg/front_end/test/fasta/rasta/bad_continue.dart.direct.expect
index 049014a8102..ce80cb6d60c 100644
--- a/pkg/front_end/test/fasta/rasta/bad_continue.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/bad_continue.dart.direct.expect
@@ -2,6 +2,6 @@ library;
 import self as self;
 
 static method main() → dynamic {
-  invalid-statement;
+  throw "pkg/fasta/test/rasta/bad_continue.dart:239: \u0027[31mError: Can't find label 'here'.\u0027[0m";
   invalid-statement;
 }
diff --git a/pkg/front_end/test/fasta/rasta/bad_explicit_super_constructor.dart.direct.expect b/pkg/front_end/test/fasta/rasta/bad_explicit_super_constructor.dart.direct.expect
index 696ceca679c..a0d831109bf 100644
--- a/pkg/front_end/test/fasta/rasta/bad_explicit_super_constructor.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/bad_explicit_super_constructor.dart.direct.expect
@@ -3,12 +3,12 @@ import self as self;
 import "dart:core" as core;
 
 class A extends core::Object {
-  constructor •(dynamic x) → dynamic
+  constructor •(dynamic x) → void
     : super core::Object::•()
     ;
 }
 class B extends self::A {
-  const constructor •() → dynamic
+  const constructor •() → void
     : invalid-initializer
     ;
 }
diff --git a/pkg/front_end/test/fasta/rasta/bad_setter_initializer.dart.direct.expect b/pkg/front_end/test/fasta/rasta/bad_setter_initializer.dart.direct.expect
index 4bccd3575db..4e4490d2435 100644
--- a/pkg/front_end/test/fasta/rasta/bad_setter_initializer.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/bad_setter_initializer.dart.direct.expect
@@ -3,8 +3,8 @@ import self as self;
 import "dart:core" as core;
 
 class C extends core::Object {
-  constructor •() → dynamic
-    : invalid-initializer, super core::Object::•()
+  constructor •() → void
+    : final dynamic #t1 = throw "pkg/fasta/test/rasta/bad_setter_initializer.dart:237: \u0027[31mError: Can't use field here.\u0027[0m", super core::Object::•()
     ;
   set field(dynamic value) → dynamic {}
 }
diff --git a/pkg/front_end/test/fasta/rasta/breaking_bad.dart.direct.expect b/pkg/front_end/test/fasta/rasta/breaking_bad.dart.direct.expect
index a5d5ed0714f..c24ac802ab2 100644
--- a/pkg/front_end/test/fasta/rasta/breaking_bad.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/breaking_bad.dart.direct.expect
@@ -2,7 +2,7 @@ library;
 import self as self;
 
 static method main() → dynamic {
-  invalid-statement;
+  throw "pkg/fasta/test/rasta/breaking_bad.dart:230: \u0027[31mError:\nNo target of break.\u0027[0m";
   #L1:
   break #L1;
 }
diff --git a/pkg/front_end/test/fasta/rasta/cascades.dart.direct.expect b/pkg/front_end/test/fasta/rasta/cascades.dart.direct.expect
index ef94f0caf00..8d6f5d10b3f 100644
--- a/pkg/front_end/test/fasta/rasta/cascades.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/cascades.dart.direct.expect
@@ -3,8 +3,9 @@ import self as self;
 import "dart:core" as core;
 
 class A extends core::Object {
-  constructor •() → self::A
-    : super core::Object::•();
+  constructor •() → void
+    : super core::Object::•()
+    ;
   method add(dynamic x) → dynamic
     return x;
 }
diff --git a/pkg/front_end/test/fasta/rasta/class_member.dart.direct.expect b/pkg/front_end/test/fasta/rasta/class_member.dart.direct.expect
index af4961455ec..4f7da5e8aea 100644
--- a/pkg/front_end/test/fasta/rasta/class_member.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/class_member.dart.direct.expect
@@ -3,16 +3,16 @@ import self as self;
 import "dart:core" as core;
 
 class Foo extends core::Object {
-  field dynamic field1;
-  field dynamic field2;
-  field dynamic field3;
-  constructor constructor1() → dynamic
+  field dynamic field1 = null;
+  field dynamic field2 = null;
+  field dynamic field3 = null;
+  constructor constructor1() → void
     : super core::Object::•()
     ;
-  constructor constructor2() → dynamic
+  constructor constructor2() → void
     : super core::Object::•()
     ;
-  constructor constructor3() → dynamic
+  constructor constructor3() → void
     : super core::Object::•()
     ;
   method a() → dynamic {}
diff --git a/pkg/front_end/test/fasta/rasta/deferred_load.dart.direct.expect b/pkg/front_end/test/fasta/rasta/deferred_load.dart.direct.expect
index 6de3c9afd6d..d7651c07dfe 100644
--- a/pkg/front_end/test/fasta/rasta/deferred_load.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/deferred_load.dart.direct.expect
@@ -1,7 +1,8 @@
 library;
 import self as self;
+import "dart:core" as core;
 
 static method main() → dynamic {
-  invalid-expression;
-  invalid-expression;
+  throw new core::NoSuchMethodError::•(null, #loadLibrary, <dynamic>[], <dynamic, dynamic>{}, null);
+  throw new core::NoSuchMethodError::•(null, #lib.loadLibrary, <dynamic>[], <dynamic, dynamic>{}, null);
 }
diff --git a/pkg/front_end/test/fasta/rasta/duplicated_mixin.dart.direct.expect b/pkg/front_end/test/fasta/rasta/duplicated_mixin.dart.direct.expect
index c82df797e40..871625f5a40 100644
--- a/pkg/front_end/test/fasta/rasta/duplicated_mixin.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/duplicated_mixin.dart.direct.expect
@@ -3,21 +3,25 @@ import self as self;
 import "dart:core" as core;
 
 class Mixin extends core::Object {
-  field dynamic field;
-  constructor •() → self::Mixin
-    : super core::Object::•();
+  field dynamic field = null;
+  constructor •() → void
+    : super core::Object::•()
+    ;
 }
-class A extends self::Object+Mixin+Mixin#0 {
-  constructor •() → self::A
-    : super self::Object+Mixin+Mixin#0::•();
+class A extends self::Object&Mixin&Mixin {
+  constructor •() → void
+    : super self::Object&Mixin&Mixin::•()
+    ;
 }
-abstract class Object+Mixin+Mixin#0 extends self::Object+Mixin#0 implements self::Mixin {
-  field dynamic field;
-  constructor •() → dynamic
-    : super self::Object+Mixin#0::•();
+abstract class Object&Mixin extends core::Object implements self::Mixin {
+  field dynamic field = null;
+  constructor •() → void
+    : super core::Object::•()
+    ;
 }
-abstract class Object+Mixin#0 extends core::Object implements self::Mixin {
-  field dynamic field;
-  constructor •() → dynamic
-    : super core::Object::•();
+abstract class Object&Mixin&Mixin extends self::Object&Mixin implements self::Mixin {
+  field dynamic field = null;
+  constructor •() → void
+    : super self::Object&Mixin::•()
+    ;
 }
diff --git a/pkg/front_end/test/fasta/rasta/enum.dart.direct.expect b/pkg/front_end/test/fasta/rasta/enum.dart.direct.expect
index 6f517ea3231..06c8cda3e15 100644
--- a/pkg/front_end/test/fasta/rasta/enum.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/enum.dart.direct.expect
@@ -3,13 +3,13 @@ import self as self;
 import "dart:core" as core;
 
 class Foo extends core::Object {
-  final field dynamic index;
-  static const field dynamic ec1 = const self::Foo::•(0);
-  static const field dynamic ec2 = const self::Foo::•(1);
-  static const field dynamic values = const <dynamic>[self::Foo::ec1, self::Foo::ec2];
+  final field core::int index;
+  static const field core::List<self::Foo> values = const <self::Foo>[self::Foo::ec1, self::Foo::ec2];
+  static const field self::Foo ec1 = const self::Foo::•(0);
+  static const field self::Foo ec2 = const self::Foo::•(1);
   const constructor •(core::int index) → void
     : self::Foo::index = index, super core::Object::•()
     ;
   method toString() → core::String
-    return const <dynamic, dynamic>{0: "Foo.ec1", 1: "Foo.ec2"}.[](this.index);
+    return const <core::int, core::String>{0: "Foo.ec1", 1: "Foo.ec2"}.[](this.{=self::Foo::index});
 }
diff --git a/pkg/front_end/test/fasta/rasta/external_factory_redirection.dart.direct.expect b/pkg/front_end/test/fasta/rasta/external_factory_redirection.dart.direct.expect
index 8977e845153..9a0f2dc39dc 100644
--- a/pkg/front_end/test/fasta/rasta/external_factory_redirection.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/external_factory_redirection.dart.direct.expect
@@ -5,5 +5,5 @@ import "dart:core" as core;
 
 static method main() → dynamic {
   "Should redirect to LinkedHashMap constructor.";
-  col::LinkedHashMap::•<core::Symbol, dynamic>();
+  col::LinkedHashMap::•<core::Symbol, dynamic>(equals: null, hashCode: null, isValidKey: null);
 }
diff --git a/pkg/front_end/test/fasta/rasta/generic_factory.dart.direct.expect b/pkg/front_end/test/fasta/rasta/generic_factory.dart.direct.expect
index 52b736e0757..1cd0c54c1c1 100644
--- a/pkg/front_end/test/fasta/rasta/generic_factory.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/generic_factory.dart.direct.expect
@@ -3,19 +3,22 @@ import self as self;
 import "dart:core" as core;
 
 class C1 extends core::Object {
-  constructor •() → self::C1
-    : super core::Object::•();
+  constructor •() → void
+    : super core::Object::•()
+    ;
 }
 class C2 extends core::Object {
-  constructor •() → self::C2
-    : super core::Object::•();
+  constructor •() → void
+    : super core::Object::•()
+    ;
 }
 class C3 extends core::Object {
-  constructor •() → self::C3
-    : super core::Object::•();
+  constructor •() → void
+    : super core::Object::•()
+    ;
 }
 class A<T extends core::Object> extends core::Object {
-  constructor internal() → dynamic
+  constructor internal() → void
     : super core::Object::•()
     ;
   static factory a<T extends core::Object>() → self::A<self::A::a::T>
@@ -23,10 +26,10 @@ class A<T extends core::Object> extends core::Object {
   static factory b<T extends core::Object>() → self::A<self::A::b::T>
     invalid-statement;
   static factory c<T extends core::Object>() → self::A<self::A::c::T>
-    invalid-statement;
+    throw "Missing constructor: Missing";
 }
 class B<S extends core::Object> extends self::A<self::B::S> {
-  constructor internal() → dynamic
+  constructor internal() → void
     : super self::A::internal()
     ;
   static factory a<S extends core::Object>() → self::B<self::B::a::S>
@@ -35,7 +38,7 @@ class B<S extends core::Object> extends self::A<self::B::S> {
     invalid-statement;
 }
 class C<U extends core::Object> extends self::B<self::C::U> {
-  constructor •() → dynamic
+  constructor •() → void
     : super self::B::internal()
     ;
 }
@@ -44,5 +47,5 @@ static method main() → dynamic {
   new self::C::•<self::C1>();
   new self::C::•<self::C3>();
   new self::C::•<self::C2>();
-  invalid-expression.call();
+  self::A::c<self::C3>();
 }
diff --git a/pkg/front_end/test/fasta/rasta/issue_000001.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000001.dart.direct.expect
index 9897c9f880d..f16af33f20e 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000001.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000001.dart.direct.expect
@@ -6,5 +6,5 @@ static method test0(dynamic x) → dynamic {
   core::print("test0");
 }
 static method main() → dynamic {
-  self::test0(0, 1);
+  throw new core::NoSuchMethodError::•(null, #test0, <dynamic>[0, 1], <dynamic, dynamic>{}, null);
 }
diff --git a/pkg/front_end/test/fasta/rasta/issue_000002.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000002.dart.direct.expect
index 2827eb81bbc..6967724f15b 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000002.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000002.dart.direct.expect
@@ -6,14 +6,14 @@ import "dart:typed_data" as typ;
 
 class Foo extends core::Object {
   final field dynamic value;
-  constructor •(dynamic value) → dynamic
+  constructor •(dynamic value) → void
     : self::Foo::value = value, super core::Object::•() {}
-  static factory fac(dynamic value) → self::Foo {
+  static factory fac(dynamic value) → dynamic {
     return new self::Foo::•(value);
   }
 }
 static field dynamic list = <dynamic>[1, 2, 3];
 static method main() → dynamic {
-  exp::Expect::isTrue(typ::Uint8List::fromList(self::list).[](1).==(2));
-  exp::Expect::isTrue(self::Foo::fac(10).value.==(10));
+  exp::Expect::isTrue(typ::Uint8List::fromList(self::list).[](1).==(2), null);
+  exp::Expect::isTrue(self::Foo::fac(10).value.==(10), null);
 }
diff --git a/pkg/front_end/test/fasta/rasta/issue_000004.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000004.dart.direct.expect
index 4c7bdc02570..038545a2da4 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000004.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000004.dart.direct.expect
@@ -28,7 +28,7 @@ static method fact6() → dynamic {
   return f;
 }
 static method main() → dynamic {
-  exp::Expect::isTrue(self::fact4().==(24));
-  exp::Expect::isTrue(self::fact5().==(120));
-  exp::Expect::isTrue(self::fact6().==(720));
+  exp::Expect::isTrue(self::fact4().==(24), null);
+  exp::Expect::isTrue(self::fact5().==(120), null);
+  exp::Expect::isTrue(self::fact6().==(720), null);
 }
diff --git a/pkg/front_end/test/fasta/rasta/issue_000007.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000007.dart.direct.expect
index 7b13cd1fbb5..dc735b036e9 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000007.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000007.dart.direct.expect
@@ -3,22 +3,26 @@ import self as self;
 import "dart:core" as core;
 
 class Base extends core::Object {
-  constructor •() → self::Base
-    : super core::Object::•();
+  constructor •() → void
+    : super core::Object::•()
+    ;
 }
 class Mixin extends core::Object {
-  constructor •() → self::Mixin
-    : super core::Object::•();
+  constructor •() → void
+    : super core::Object::•()
+    ;
   method foo() → dynamic
     return core::print("foo");
 }
-class Sub extends self::Base+Mixin#0 {
-  constructor •() → self::Sub
-    : super self::Base+Mixin#0::•();
+class Sub extends self::Base&Mixin {
+  constructor •() → void
+    : super self::Base&Mixin::•()
+    ;
 }
-abstract class Base+Mixin#0 extends self::Base implements self::Mixin {
-  constructor •() → self::Base
-    : super self::Base::•();
+abstract class Base&Mixin extends self::Base implements self::Mixin {
+  constructor •() → void
+    : super self::Base::•()
+    ;
   method foo() → dynamic
     return core::print("foo");
 }
diff --git a/pkg/front_end/test/fasta/rasta/issue_000008.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000008.dart.direct.expect
index b63423c0075..034eb0dde77 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000008.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000008.dart.direct.expect
@@ -4,7 +4,7 @@ import "dart:core" as core;
 
 class C extends core::Object {
   final field dynamic x;
-  constructor •(dynamic x) → dynamic
+  constructor •(dynamic x) → void
     : self::C::x = x, super core::Object::•()
     ;
 }
diff --git a/pkg/front_end/test/fasta/rasta/issue_000012.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000012.dart.direct.expect
index 57f70750b3b..db0b7d9e3e9 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000012.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000012.dart.direct.expect
@@ -3,15 +3,17 @@ import self as self;
 import "dart:core" as core;
 
 class A extends core::Object {
-  field dynamic field;
-  constructor •() → self::A
-    : super core::Object::•();
+  field dynamic field = null;
+  constructor •() → void
+    : super core::Object::•()
+    ;
 }
 class B extends self::A {
-  constructor •() → self::B
-    : super self::A::•();
+  constructor •() → void
+    : super self::A::•()
+    ;
   method m() → dynamic {
-    super.{self::A::field} = 42;
+    this.{=self::A::field} = 42;
   }
 }
 static method main() → dynamic {
diff --git a/pkg/front_end/test/fasta/rasta/issue_000025.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000025.dart.direct.expect
index 5fabc154565..59011d013be 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000025.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000025.dart.direct.expect
@@ -2,9 +2,9 @@ library;
 import self as self;
 import "dart:core" as core;
 
+static set x(dynamic val) → dynamic {}
 static get x() → dynamic
   return 42;
-static set x(dynamic val) → dynamic {}
 static method main() → dynamic {
   core::print(self::x);
   core::print(self::x = 87);
diff --git a/pkg/front_end/test/fasta/rasta/issue_000026.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000026.dart.direct.expect
index 1f6448a2d4e..1f96e95610c 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000026.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000026.dart.direct.expect
@@ -3,18 +3,19 @@ import self as self;
 import "dart:core" as core;
 
 class C extends core::Object {
-  field dynamic a;
-  field dynamic b;
-  field dynamic c;
-  constructor •() → self::C
-    : self::C::b = 0, self::C::c = 1.+(2), super core::Object::•();
+  field dynamic a = null;
+  field dynamic b = 0;
+  field dynamic c = 1.+(2);
+  constructor •() → void
+    : super core::Object::•()
+    ;
 }
 class D extends core::Object {
-  field dynamic a;
-  field dynamic b;
-  field dynamic c;
-  constructor •() → dynamic
-    : self::D::b = 1, self::D::c = 2.-(3), super core::Object::•()
+  field dynamic a = null;
+  field dynamic b = 1;
+  field dynamic c = 2.-(3);
+  constructor •() → void
+    : super core::Object::•()
     ;
 }
 static method main() → dynamic {
diff --git a/pkg/front_end/test/fasta/rasta/issue_000031.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000031.dart.direct.expect
index da011b7fdc6..91cbb3778bc 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000031.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000031.dart.direct.expect
@@ -2,5 +2,5 @@ library;
 import self as self;
 
 static method main() → dynamic {
-  let final dynamic #t1 = invalid-expression in let final dynamic #t2 = #t1.toString() in #t1;
+  let final dynamic #t1 = throw "pkg/fasta/test/rasta/issue_000031.dart: \u0027[31mError: A library can't be used as an expression.\u0027[0m" in let final dynamic #t2 = #t1.toString() in #t1;
 }
diff --git a/pkg/front_end/test/fasta/rasta/issue_000034.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000034.dart.direct.expect
index 6b7c59f27ef..db00c68b9cf 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000034.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000034.dart.direct.expect
@@ -3,8 +3,8 @@ import self as self;
 import "dart:core" as core;
 
 class C extends core::Object {
-  const constructor •() → dynamic
-    : super core::Object::•()
+  const constructor •() → void
+    : final dynamic #t1 = throw "pkg/fasta/test/rasta/issue_000034.dart:243: \u0027[31mError: Can't use x here.\u0027[0m", super core::Object::•()
     ;
 }
 static method main() → dynamic {
diff --git a/pkg/front_end/test/fasta/rasta/issue_000035.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000035.dart.direct.expect
index 9d3db1dc6da..57cf9380a2b 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000035.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000035.dart.direct.expect
@@ -3,7 +3,8 @@ import self as self;
 import "dart:core" as core;
 
 class C extends core::Object {
-  constructor •() → dynamic
+  constructor •() → void
     : super core::Object::•()
     ;
+  abstract method æøC() → dynamic;
 }
diff --git a/pkg/front_end/test/fasta/rasta/issue_000043.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000043.dart.direct.expect
index 4b9a25a02a5..44eaf8121dd 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000043.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000043.dart.direct.expect
@@ -3,8 +3,9 @@ import self as self;
 import "dart:core" as core;
 
 class C extends core::Object {
-  constructor •() → self::C
-    : super core::Object::•();
+  constructor •() → void
+    : super core::Object::•()
+    ;
   get x() → dynamic
     return "${self::C}".hashCode;
 }
diff --git a/pkg/front_end/test/fasta/rasta/issue_000053.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000053.dart.direct.expect
index a4e10a5e5b8..d77061ff02c 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000053.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000053.dart.direct.expect
@@ -3,12 +3,13 @@ import self as self;
 import "dart:core" as core;
 
 class C extends core::Object {
-  constructor •() → self::C
-    : super core::Object::•();
+  constructor •() → void
+    : super core::Object::•()
+    ;
   operator ==(dynamic other) → dynamic
     return throw "x";
   method test() → dynamic {
-    super.{core::Object::==}(null);
+    this.{=core::Object::==}(null);
   }
 }
 static method main() → dynamic {
diff --git a/pkg/front_end/test/fasta/rasta/issue_000067.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000067.dart.direct.expect
index a6a8913364c..461c046d22d 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000067.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000067.dart.direct.expect
@@ -4,29 +4,30 @@ import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
 class A extends core::Object {
-  constructor •() → dynamic
+  constructor •() → void
     : super core::Object::•() {}
+  method m() → core::int {}
   static factory foo() → self::A
     invalid-statement;
-  method m() → core::int {}
 }
 class C extends self::A {
-  constructor •() → dynamic
+  constructor •() → void
     : super self::A::•() {}
-  static factory bar() → self::C
-    invalid-statement;
   method m() → core::int {
     return 1;
   }
+  static factory bar() → self::C
+    throw "Missing constructor: D";
 }
 class D extends self::C {
-  constructor •() → self::D
-    : super self::C::•();
+  constructor •() → void
+    : super self::C::•()
+    ;
   method m() → core::int {
     return 2;
   }
 }
 static method main() → dynamic {
-  self::A a = new self::D::•();
-  exp::Expect::equals(2, a.m());
+  self::A a = self::C::bar();
+  exp::Expect::equals(2, a.m(), null);
 }
diff --git a/pkg/front_end/test/fasta/rasta/issue_000068.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000068.dart.direct.expect
index eea257103ff..cf9d888b051 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000068.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000068.dart.direct.expect
@@ -4,27 +4,31 @@ import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
 class G<T extends core::Object> extends core::Object {
-  constructor •() → self::G<self::G::T>
-    : super core::Object::•();
+  constructor •() → void
+    : super core::Object::•()
+    ;
 }
 class A extends core::Object {
-  constructor •() → self::A
-    : super core::Object::•();
+  constructor •() → void
+    : super core::Object::•()
+    ;
 }
 class B extends self::A {
-  constructor •() → self::B
-    : super self::A::•();
+  constructor •() → void
+    : super self::A::•()
+    ;
 }
 class C extends self::B {
-  constructor •() → self::C
-    : super self::B::•();
+  constructor •() → void
+    : super self::B::•()
+    ;
 }
 static method main() → dynamic {
-  exp::Expect::isFalse(new self::G::•<self::B>() is self::G<self::C>);
-  exp::Expect::isFalse(new self::G::•<self::A>() is self::G<self::B>);
-  exp::Expect::isFalse(new self::G::•<self::A>() is self::G<self::C>);
-  exp::Expect::isFalse(new self::G::•<core::Object>() is self::G<self::B>);
-  exp::Expect::isFalse(new self::G::•<core::int>() is self::G<self::B>);
-  exp::Expect::isFalse(new self::G::•<core::int>() is self::G<core::double>);
-  exp::Expect::isFalse(new self::G::•<core::int>() is self::G<core::String>);
+  exp::Expect::isFalse(new self::G::•<self::B>() is self::G<self::C>, null);
+  exp::Expect::isFalse(new self::G::•<self::A>() is self::G<self::B>, null);
+  exp::Expect::isFalse(new self::G::•<self::A>() is self::G<self::C>, null);
+  exp::Expect::isFalse(new self::G::•<core::Object>() is self::G<self::B>, null);
+  exp::Expect::isFalse(new self::G::•<core::int>() is self::G<self::B>, null);
+  exp::Expect::isFalse(new self::G::•<core::int>() is self::G<core::double>, null);
+  exp::Expect::isFalse(new self::G::•<core::int>() is self::G<core::String>, null);
 }
diff --git a/pkg/front_end/test/fasta/rasta/issue_000069.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000069.dart.direct.expect
index 9b3d5ea0d1e..d663f146cc5 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000069.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000069.dart.direct.expect
@@ -4,7 +4,6 @@ import self as self;
 static method main() → dynamic {
   dynamic x;
   dynamic i = 0;
-  while ((let final dynamic #t1 = i in let final dynamic #t2 = i = #t1.+(1) in #t1).<(5)) {
+  while ((let final dynamic #t1 = i in let final dynamic #t2 = i = #t1.+(1) in #t1).<(5))
     dynamic x = i;
-  }
 }
diff --git a/pkg/front_end/test/fasta/rasta/issue_000070.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000070.dart.direct.expect
index 4f721a8f1f6..dfdf64c46fa 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000070.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000070.dart.direct.expect
@@ -5,32 +5,34 @@ import "package:expect/expect.dart" as exp;
 
 class A<N extends core::Object, S extends core::Object, U extends core::Object> extends core::Object {
   final field core::List<self::A::U> field;
-  constructor •(self::A::N n, self::A::S s) → dynamic
-    : self::A::field = core::List::•<self::A::U>(), super core::Object::•() {
-    exp::Expect::isTrue(n is self::A::N);
-    exp::Expect::isTrue(s is self::A::S);
+  constructor •(self::A::N n, self::A::S s) → void
+    : self::A::field = core::List::_internal<self::A::U>(core::_GROWABLE_ARRAY_MARKER), super core::Object::•() {
+    exp::Expect::isTrue(n is self::A::N, null);
+    exp::Expect::isTrue(s is self::A::S, null);
   }
-  constructor empty() → dynamic
+  constructor empty() → void
     : self::A::field = null, super core::Object::•() {}
-  const constructor c(self::A::U u, self::A::S s) → dynamic
+  const constructor c(self::A::U u, self::A::S s) → void
     : self::A::field = const <dynamic>[null], super core::Object::•()
     ;
-  static factory f<N extends core::Object, S extends core::Object, U extends core::Object>(self::A::f::S s) → self::A<self::A::f::N, self::A::f::S, self::A::f::U> {
-    exp::Expect::isTrue(s is self::A::f::S);
-    return new self::A::empty<dynamic, dynamic, dynamic>();
-  }
   get getter() → core::List<self::A::U> {
     return this.field;
   }
   set setter(self::A::S s) → void {}
+  static factory f<N extends core::Object, S extends core::Object, U extends core::Object>(self::A::f::S s) → self::A<self::A::f::N, self::A::f::S, self::A::f::U> {
+    exp::Expect::isTrue(s is self::A::f::S, null);
+    return new self::A::empty<dynamic, dynamic, dynamic>();
+  }
 }
 abstract class J<Aa extends core::Object, B extends core::Object> extends core::Object {
-  constructor •() → self::J<self::J::Aa, self::J::B>
-    : super core::Object::•();
+  constructor •() → void
+    : super core::Object::•()
+    ;
 }
 abstract class I<H extends core::Object, C extends core::Object, K extends core::Object> extends self::J<self::I::C, self::I::K> {
-  constructor •() → self::I<self::I::H, self::I::C, self::I::K>
-    : super self::J::•();
+  constructor •() → void
+    : super self::J::•()
+    ;
 }
 static method main() → dynamic {
   new self::A::•<core::num, core::double, core::List<dynamic>>(1, 2.0);
diff --git a/pkg/front_end/test/fasta/rasta/issue_000080.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000080.dart.direct.expect
index a88b73672d1..48863d761d6 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000080.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000080.dart.direct.expect
@@ -3,24 +3,27 @@ import self as self;
 import "dart:core" as core;
 
 class Mixin extends core::Object {
-  field dynamic field;
-  constructor •() → self::Mixin
-    : super core::Object::•();
+  field dynamic field = null;
+  constructor •() → void
+    : super core::Object::•()
+    ;
   method foo() → dynamic
     return 87;
 }
-class Foo extends self::Object+Mixin#0 {
-  constructor •() → self::Foo
-    : super self::Object+Mixin#0::•();
+class Foo extends self::Object&Mixin {
+  constructor •() → void
+    : super self::Object&Mixin::•()
+    ;
   method foo() → dynamic
-    return super.{self::Object+Mixin#0::foo}();
+    return this.{=self::Object&Mixin::foo}();
   method bar() → dynamic
-    return super.{self::Object+Mixin#0::field};
+    return this.{=self::Object&Mixin::field};
 }
-abstract class Object+Mixin#0 extends core::Object implements self::Mixin {
-  field dynamic field;
-  constructor •() → dynamic
-    : super core::Object::•();
+abstract class Object&Mixin extends core::Object implements self::Mixin {
+  field dynamic field = null;
+  constructor •() → void
+    : super core::Object::•()
+    ;
   method foo() → dynamic
     return 87;
 }
diff --git a/pkg/front_end/test/fasta/rasta/issue_000081.dart.direct.expect b/pkg/front_end/test/fasta/rasta/issue_000081.dart.direct.expect
index b43b34f74c9..2ed2e94292e 100644
--- a/pkg/front_end/test/fasta/rasta/issue_000081.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/issue_000081.dart.direct.expect
@@ -3,18 +3,20 @@ import self as self;
 import "dart:core" as core;
 
 class Base extends core::Object {
-  field core::int hashCode;
-  constructor •() → self::Base
-    : self::Base::hashCode = 42, super core::Object::•();
+  field core::int hashCode = 42;
+  constructor •() → void
+    : super core::Object::•()
+    ;
 }
 class Sub extends self::Base {
-  field core::int _hashCode;
-  constructor •() → self::Sub
-    : self::Sub::_hashCode = null, super self::Base::•();
+  field core::int _hashCode = null;
+  constructor •() → void
+    : super self::Base::•()
+    ;
   get hashCode() → dynamic
-    return let final dynamic #t1 = this._hashCode in #t1.==(null) ? this._hashCode = super.{self::Base::hashCode} : #t1;
+    return let final dynamic #t1 = this._hashCode in #t1.==(null) ? this._hashCode = this.{=self::Base::hashCode} : #t1;
   method foo() → dynamic {
-    this._hashCode.==(null) ? this._hashCode = super.{self::Base::hashCode} : null;
+    this._hashCode.==(null) ? this._hashCode = this.{=self::Base::hashCode} : null;
   }
 }
 static method main() → dynamic {
diff --git a/pkg/front_end/test/fasta/rasta/malformed_function.dart.direct.expect b/pkg/front_end/test/fasta/rasta/malformed_function.dart.direct.expect
index 1cafd639c0b..6cc206bf3f9 100644
--- a/pkg/front_end/test/fasta/rasta/malformed_function.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/malformed_function.dart.direct.expect
@@ -1,5 +1,6 @@
 library;
 import self as self;
 
-static method main() → dynamic
-  invalid-statement;
+static method main() → dynamic {
+  throw "pkg/fasta/test/rasta/malformed_function.dart:238: \u0027[31mError: Can't assign to this.\u0027[0m";
+}
diff --git a/pkg/front_end/test/fasta/rasta/mixin_library.dart.direct.expect b/pkg/front_end/test/fasta/rasta/mixin_library.dart.direct.expect
index 07424791301..59fc221a5ea 100644
--- a/pkg/front_end/test/fasta/rasta/mixin_library.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/mixin_library.dart.direct.expect
@@ -3,14 +3,15 @@ import self as self;
 import "dart:core" as core;
 
 class Mixin<T extends core::Object> extends core::Object {
-  field dynamic x;
-  field dynamic y;
-  field dynamic z;
-  field self::Mixin::T t;
-  constructor •() → self::Mixin<self::Mixin::T>
-    : self::Mixin::x = self::f(), super core::Object::•();
+  field dynamic x = self::f();
+  field dynamic y = null;
+  field dynamic z = null;
+  field self::Mixin::T t = null;
+  constructor •() → void
+    : super core::Object::•()
+    ;
   method foo() → dynamic
-    return (throw core::_unresolvedSuperMethodError(this, #foo, <dynamic>[], <dynamic, dynamic>{}, null)).+(self::f());
+    return (throw new core::NoSuchMethodError::•(null, #foo, <dynamic>[], <dynamic, dynamic>{}, null)).+(self::f());
   method g(self::Mixin::T a) → self::Mixin::T
     return null;
   method h() → dynamic
diff --git a/pkg/front_end/test/fasta/rasta/super_initializer.dart.direct.expect b/pkg/front_end/test/fasta/rasta/super_initializer.dart.direct.expect
index 0fa9f707cf8..4e61944e57a 100644
--- a/pkg/front_end/test/fasta/rasta/super_initializer.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/super_initializer.dart.direct.expect
@@ -3,25 +3,25 @@ import self as self;
 import "dart:core" as core;
 
 class Super extends core::Object {
-  constructor arg0() → dynamic
+  constructor arg0() → void
     : super core::Object::•()
     ;
-  constructor arg1(dynamic a) → dynamic
+  constructor arg1(dynamic a) → void
     : super core::Object::•()
     ;
-  constructor arg2(dynamic a, dynamic b) → dynamic
+  constructor arg2(dynamic a, dynamic b) → void
     : super core::Object::•()
     ;
 }
 class Sub extends self::Super {
   field dynamic field;
-  constructor arg0() → dynamic
-    : super self::Super::arg0(), self::Sub::field = 42
+  constructor arg0() → void
+    : self::Sub::field = 42, super self::Super::arg0()
     ;
-  constructor arg1(dynamic a) → dynamic
-    : super self::Super::arg1(a), self::Sub::field = 42
+  constructor arg1(dynamic a) → void
+    : final dynamic #t1 = a, self::Sub::field = 42, super self::Super::arg1(#t1)
     ;
-  constructor arg2(dynamic a, dynamic b) → dynamic
-    : super self::Super::arg2(a, b), self::Sub::field = 42
+  constructor arg2(dynamic a, dynamic b) → void
+    : final dynamic #t2 = a, final dynamic #t3 = b, self::Sub::field = 42, super self::Super::arg2(#t2, #t3)
     ;
 }
diff --git a/pkg/front_end/test/fasta/rasta/super_operator.dart.direct.expect b/pkg/front_end/test/fasta/rasta/super_operator.dart.direct.expect
index 39381c52a81..4d09b8166f9 100644
--- a/pkg/front_end/test/fasta/rasta/super_operator.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/super_operator.dart.direct.expect
@@ -3,8 +3,9 @@ import self as self;
 import "dart:core" as core;
 
 class A extends core::Object {
-  constructor •() → self::A
-    : super core::Object::•();
+  constructor •() → void
+    : super core::Object::•()
+    ;
   operator +(core::String s) → dynamic
     return null;
   operator [](dynamic i) → dynamic
@@ -12,18 +13,20 @@ class A extends core::Object {
   operator []=(dynamic i, dynamic val) → dynamic {}
 }
 class B extends self::A {
-  constructor •() → self::B
-    : super self::A::•();
+  constructor •() → void
+    : super self::A::•()
+    ;
   operator +(core::String s) → dynamic
-    return super.{self::A::+}("${s}${s}");
+    return this.{=self::A::+}("${s}${s}");
   operator [](dynamic i) → dynamic
-    return super.{self::A::[]}(i);
+    return this.{=self::A::[]}(i);
   operator []=(dynamic i, dynamic val) → dynamic
     return let final dynamic #t1 = let final dynamic #t2 = i in let final dynamic #t3 = i = #t2.+(1) in #t2 in let final dynamic #t4 = super.{self::A::[]}(#t1).+(val) in let final dynamic #t5 = super.{self::A::[]=}(#t1, #t4) in #t4;
 }
 class Autobianchi extends core::Object {
-  constructor •() → self::Autobianchi
-    : super core::Object::•();
+  constructor •() → void
+    : super core::Object::•()
+    ;
   method g() → dynamic
     return super.[](0);
 }
diff --git a/pkg/front_end/test/fasta/rasta/supports_reflection.dart.direct.expect b/pkg/front_end/test/fasta/rasta/supports_reflection.dart.direct.expect
index b7bfa566da7..897d307a8a6 100644
--- a/pkg/front_end/test/fasta/rasta/supports_reflection.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/supports_reflection.dart.direct.expect
@@ -3,5 +3,5 @@ import self as self;
 import "dart:core" as core;
 
 static method main() → dynamic {
-  core::print(const core::bool::fromEnvironment("dart.library.mirrors"));
+  core::print(const core::bool::fromEnvironment("dart.library.mirrors", defaultValue: false));
 }
diff --git a/pkg/front_end/test/fasta/rasta/switch_execution_case_t02.dart.direct.expect b/pkg/front_end/test/fasta/rasta/switch_execution_case_t02.dart.direct.expect
index 63f4c55cd35..8dc5d5aad5e 100644
--- a/pkg/front_end/test/fasta/rasta/switch_execution_case_t02.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/switch_execution_case_t02.dart.direct.expect
@@ -26,7 +26,9 @@ static method test(dynamic value) → dynamic {
       }
     #L5:
     default:
-      result = 4;
+      {
+        result = 4;
+      }
   }
   return result;
 }
diff --git a/pkg/front_end/test/fasta/rasta/switch_fall_through.dart.direct.expect b/pkg/front_end/test/fasta/rasta/switch_fall_through.dart.direct.expect
index 060c252c33e..f83ad0a34f1 100644
--- a/pkg/front_end/test/fasta/rasta/switch_fall_through.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/switch_fall_through.dart.direct.expect
@@ -8,9 +8,11 @@ static method main() → dynamic {
     #L2:
     case 1:
       {
-        "No fall-through error needed.";
-        break #L1;
-        ;
+        {
+          "No fall-through error needed.";
+          break #L1;
+          ;
+        }
       }
     #L3:
     case 2:
@@ -25,19 +27,23 @@ static method main() → dynamic {
       }
     #L4:
     case 3:
-      try {
-        "No fall-through error needed.";
-      }
-      finally {
-        break #L1;
+      {
+        try {
+          "No fall-through error needed.";
+        }
+        finally {
+          break #L1;
+        }
       }
     #L5:
     case 4:
-      try {
-        "No fall-through error needed.";
-        break #L1;
-      }
-      finally {
+      {
+        try {
+          "No fall-through error needed.";
+          break #L1;
+        }
+        finally {
+        }
       }
     #L6:
     case 5:
@@ -51,6 +57,8 @@ static method main() → dynamic {
       }
     #L7:
     case 10000:
-      "Should be last. No fall-through error, falling through allowed here.";
+      {
+        "Should be last. No fall-through error, falling through allowed here.";
+      }
   }
 }
diff --git a/pkg/front_end/test/fasta/rasta/this_invoke.dart.direct.expect b/pkg/front_end/test/fasta/rasta/this_invoke.dart.direct.expect
index a605b59496e..b366a22c56a 100644
--- a/pkg/front_end/test/fasta/rasta/this_invoke.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/this_invoke.dart.direct.expect
@@ -3,8 +3,9 @@ import self as self;
 import "dart:core" as core;
 
 class C extends core::Object {
-  constructor •() → self::C
-    : super core::Object::•();
+  constructor •() → void
+    : super core::Object::•()
+    ;
   method m(dynamic x) → dynamic
     return this.call(x);
   method call(dynamic x) → dynamic
diff --git a/pkg/front_end/test/fasta/rasta/type_literals.dart.direct.expect b/pkg/front_end/test/fasta/rasta/type_literals.dart.direct.expect
index 0fc21cf9eb4..e57d938818e 100644
--- a/pkg/front_end/test/fasta/rasta/type_literals.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/type_literals.dart.direct.expect
@@ -3,8 +3,9 @@ import self as self;
 import "dart:core" as core;
 
 class C<T extends core::Object> extends core::Object {
-  constructor •() → self::C<self::C::T>
-    : super core::Object::•();
+  constructor •() → void
+    : super core::Object::•()
+    ;
   method test() → dynamic {
     self::C<dynamic>;
     self::use(self::C<dynamic>);
diff --git a/pkg/front_end/test/fasta/rasta/unresolved.dart.direct.expect b/pkg/front_end/test/fasta/rasta/unresolved.dart.direct.expect
index 7a8674fcf6d..4ea54845bd1 100644
--- a/pkg/front_end/test/fasta/rasta/unresolved.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/unresolved.dart.direct.expect
@@ -3,5 +3,5 @@ import self as self;
 import "dart:core" as core;
 
 static method main() → dynamic {
-  throw core::_malformedTypeError("Cannot resolve 'Missing'.");
+  throw new core::NoSuchMethodError::•(null, #Missing, <dynamic>[], <dynamic, dynamic>{}, null);
 }
diff --git a/pkg/front_end/test/fasta/rasta/unresolved_constructor.dart.direct.expect b/pkg/front_end/test/fasta/rasta/unresolved_constructor.dart.direct.expect
index 93d15b09bdd..4fe083a2d24 100644
--- a/pkg/front_end/test/fasta/rasta/unresolved_constructor.dart.direct.expect
+++ b/pkg/front_end/test/fasta/rasta/unresolved_constructor.dart.direct.expect
@@ -3,11 +3,11 @@ import self as self;
 import "dart:core" as core;
 
 class Foo extends core::Object {
-  constructor •(dynamic x, dynamic y) → dynamic
+  constructor •(dynamic x, dynamic y) → void
     : super core::Object::•()
     ;
 }
 static method main() → dynamic {
-  invalid-expression;
-  throw core::_unresolvedConstructorError(self::Foo, #Foo.notHere, <dynamic>[], <dynamic, dynamic>{}, null);
+  throw new core::NoSuchMethodError::•(null, #, <dynamic>[], <dynamic, dynamic>{}, null);
+  throw new core::NoSuchMethodError::•(null, #Foo.notHere, <dynamic>[], <dynamic, dynamic>{}, null);
 }