commit d84d3f8e42e12aa4d426bcc490f77da00a4b95f9
author Paul Berry <paulberry@google.com> Tue Jun 19 21:42:31 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Tue Jun 19 21:42:31 2018 +0000
tree da71bd4d652219c9bcb088db04f1fba59f72552c
parent 3a2a84db9c4a47a1c59ae2eed2e9c0b0e7b43f8c

Convert ShadowNullLiteral to NullJudgment.

Change-Id: I5d38b16b0416f04255fa46c44a5aa89a15848a83
Reviewed-on: https://dart-review.googlesource.com/61100
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Paul Berry <paulberry@google.com>

pkg/front_end/lib/src/fasta/kernel/fangorn.dart

diff --git a/pkg/front_end/lib/src/fasta/kernel/fangorn.dart b/pkg/front_end/lib/src/fasta/kernel/fangorn.dart
index 4da73f9..93c5ff8 100644
--- a/pkg/front_end/lib/src/fasta/kernel/fangorn.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/fangorn.dart
@@ -92,7 +92,7 @@
         ShadowLogicalExpression,
         ShadowMapLiteral,
         ShadowNot,
-        ShadowNullLiteral,
+        NullJudgment,
         ShadowRethrow,
         ShadowReturnStatement,
         ShadowStringConcatenation,
@@ -205,8 +205,8 @@
   }
 
   @override
-  ShadowNullLiteral literalNull(Token token) {
-    return new ShadowNullLiteral()..fileOffset = offsetForToken(token);
+  NullJudgment literalNull(Token token) {
+    return new NullJudgment()..fileOffset = offsetForToken(token);
   }
 
   @override

pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart

diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart
index c5a0997..005ec01 100644
--- a/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart
@@ -1827,7 +1827,7 @@
 }
 
 /// Concrete shadow object representing a null literal in kernel form.
-class ShadowNullLiteral extends NullLiteral implements ExpressionJudgment {
+class NullJudgment extends NullLiteral implements ExpressionJudgment {
   DartType inferredType;
 
   @override
@@ -1835,7 +1835,7 @@
       ShadowTypeInferrer inferrer,
       Factory<Expression, Statement, Initializer, Type> factory,
       DartType typeContext) {
-    return inferrer.coreTypes.nullClass.rawType;
+    return inferredType = inferrer.coreTypes.nullClass.rawType;
   }
 }
 

pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart

diff --git a/pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart b/pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart
index d3184ec..9a34ec7 100644
--- a/pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart
+++ b/pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart
@@ -73,7 +73,7 @@
         ShadowConstructorInvocation,
         ShadowField,
         ShadowMember,
-        ShadowNullLiteral,
+        NullJudgment,
         ShadowVariableDeclaration;
 
 import '../names.dart' show callName;
@@ -1203,7 +1203,7 @@
         inferMetadataKeepingHelper(factory, parameter.annotations);
         if (i >= function.requiredParameterCount &&
             parameter.initializer == null) {
-          parameter.initializer = new ShadowNullLiteral()..parent = parameter;
+          parameter.initializer = new NullJudgment()..parent = parameter;
         }
         if (parameter.initializer != null) {
           inferExpression(
@@ -1213,7 +1213,7 @@
       for (var parameter in function.namedParameters) {
         inferMetadataKeepingHelper(factory, parameter.annotations);
         if (parameter.initializer == null) {
-          parameter.initializer = new ShadowNullLiteral()..parent = parameter;
+          parameter.initializer = new NullJudgment()..parent = parameter;
         }
         inferExpression(factory, parameter.initializer, parameter.type, false);
       }