commit 2f3c983e0ac73625a9f599e427e39dd9c061629d
author Paul Berry <paulberry@google.com> Tue Jun 19 23:36:27 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Tue Jun 19 23:36:27 2018 +0000
tree a67022fb06b9efa587637db8030f0776c6f67af2
parent acd375cc773bff336d901dcdbd467cb84614afb6

Convert ShadowStaticGet to StaticGetJudgment

Change-Id: I575043c3a4289943cfc783484c0593b93f8b71e6
Reviewed-on: https://dart-review.googlesource.com/61111
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Paul Berry <paulberry@google.com>

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

diff --git a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
index 0d33fa0..7843457 100644
--- a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
@@ -4233,7 +4233,8 @@
 
   @override
   StaticGet makeStaticGet(Member readTarget, Token token) {
-    return new ShadowStaticGet(readTarget)..fileOffset = offsetForToken(token);
+    return new StaticGetJudgment(readTarget)
+      ..fileOffset = offsetForToken(token);
   }
 
   @override

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

diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_ast_api.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_ast_api.dart
index 356b102..b86cf428 100644
--- a/pkg/front_end/lib/src/fasta/kernel/kernel_ast_api.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/kernel_ast_api.dart
@@ -95,7 +95,7 @@
         ShadowRedirectingInitializer,
         ShadowReturnStatement,
         ShadowStaticAssignment,
-        ShadowStaticGet,
+        StaticGetJudgment,
         ShadowStaticInvocation,
         ShadowSuperInitializer,
         ShadowSuperMethodInvocation,

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 c0fa666..cdaa360 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
@@ -2072,10 +2072,10 @@
 
 /// Concrete shadow object representing a read of a static variable in kernel
 /// form.
-class ShadowStaticGet extends StaticGet implements ExpressionJudgment {
+class StaticGetJudgment extends StaticGet implements ExpressionJudgment {
   DartType inferredType;
 
-  ShadowStaticGet(Member target) : super(target);
+  StaticGetJudgment(Member target) : super(target);
 
   @override
   DartType infer<Expression, Statement, Initializer, Type>(
@@ -2091,7 +2091,7 @@
     if (target is Procedure && target.kind == ProcedureKind.Method) {
       type = inferrer.instantiateTearOff(type, typeContext, this);
     }
-    return type;
+    return inferredType = type;
   }
 }