Store resolution for out of range integer literals.

scheglov · commit-bot@chromium.org · commit 8df84c0a00fb · 2018-08-03T20:32:38.000Z
R=brianwilkerson@google.com Change-Id: Ice783c3fc279bfd34a5aeebf4e9e9f5f014c000b Reviewed-on: https://dart-review.googlesource.com/68423 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/test/generated/compile_time_error_code_kernel_test.dart b/pkg/analyzer/test/generated/compile_time_error_code_kernel_test.dart
@@ -560,18 +560,6 @@ class CompileTimeErrorCodeTest_Kernel extends CompileTimeErrorCodeTest_Driver {
     await super.test_instantiateEnum_new();
   }
 
-  @override
-  @failingTest
-  test_integerLiteralOutOfRange_negative() async {
-    await super.test_integerLiteralOutOfRange_negative();
-  }
-
-  @override
-  @failingTest
-  test_integerLiteralOutOfRange_positive() async {
-    await super.test_integerLiteralOutOfRange_positive();
-  }
-
   @override
   @failingTest
   test_invalidAnnotation_importWithPrefix_notVariableOrConstructorInvocation() {
diff --git a/pkg/front_end/lib/src/fasta/kernel/fangorn.dart b/pkg/front_end/lib/src/fasta/kernel/fangorn.dart
@@ -181,9 +181,10 @@ class Fangorn extends Forest {
   }
 
   @override
-  IntJudgment literalInt(int value, Token token) {
+  IntJudgment literalInt(int value, Token token, {Expression desugaredError}) {
     return new IntJudgment(
-        typeInferenceTokensSaver?.intLiteralTokens(token), value)
+        typeInferenceTokensSaver?.intLiteralTokens(token), value,
+        desugaredError: desugaredError)
       ..fileOffset = offsetForToken(token);
   }
 
diff --git a/pkg/front_end/lib/src/fasta/kernel/forest.dart b/pkg/front_end/lib/src/fasta/kernel/forest.dart
@@ -73,7 +73,7 @@ abstract class Forest {
 
   /// Return a representation of an integer literal at the given [location]. The
   /// literal has the given [value].
-  Expression literalInt(int value, Token location);
+  Expression literalInt(int value, Token location, {Expression desugaredError});
 
   /// Return a representation of a list literal. The [constKeyword] is the
   /// location of the `const` keyword, or `null` if there is no keyword. The
diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_expression_generator.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_expression_generator.dart
@@ -1427,23 +1427,30 @@ class KernelLargeIntAccessGenerator extends KernelGenerator
       : super(helper, token);
 
   @override
-  Expression _makeSimpleRead() => new SyntheticExpressionJudgment(buildError());
+  Expression _makeSimpleRead() {
+    return _buildErrorIntLiteral();
+  }
 
   @override
   Expression _makeSimpleWrite(Expression value, bool voidContext,
       ComplexAssignmentJudgment complexAssignment) {
-    return new SyntheticExpressionJudgment(buildError());
+    return _buildErrorIntLiteral();
   }
 
   @override
   Expression _makeRead(ComplexAssignmentJudgment complexAssignment) {
-    return new SyntheticExpressionJudgment(buildError());
+    return _buildErrorIntLiteral();
   }
 
   @override
   Expression _makeWrite(Expression value, bool voidContext,
       ComplexAssignmentJudgment complexAssignment) {
-    return new SyntheticExpressionJudgment(buildError());
+    return _buildErrorIntLiteral();
+  }
+
+  Expression _buildErrorIntLiteral() {
+    var error = buildError();
+    return forest.literalInt(0, token, desugaredError: error);
   }
 }
 
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
@@ -1597,16 +1597,21 @@ abstract class InitializerJudgment implements Initializer {
 /// Concrete shadow object representing an integer literal in kernel form.
 class IntJudgment extends IntLiteral implements ExpressionJudgment {
   IntLiteralTokens tokens;
+  final kernel.Expression desugaredError;
 
   DartType inferredType;
 
-  IntJudgment(this.tokens, int value) : super(value);
+  IntJudgment(this.tokens, int value, {this.desugaredError}) : super(value);
 
   @override
   Expression infer<Expression, Statement, Initializer, Type>(
       ShadowTypeInferrer inferrer, DartType typeContext) {
     inferredType = inferrer.coreTypes.intClass.rawType;
     inferrer.listener.intLiteral(this, fileOffset, tokens, value, inferredType);
+    if (desugaredError != null) {
+      parent.replaceChild(this, desugaredError);
+      parent = null;
+    }
     return null;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -181,9 +181,10 @@ class Fangorn extends Forest {`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`@override`
`184`		`- IntJudgment literalInt(int value, Token token) {`
	`184`	`+ IntJudgment literalInt(int value, Token token, {Expression desugaredError}) {`
`185`	`185`	`return new IntJudgment(`
`186`		`- typeInferenceTokensSaver?.intLiteralTokens(token), value)`
	`186`	`+ typeInferenceTokensSaver?.intLiteralTokens(token), value,`
	`187`	`+ desugaredError: desugaredError)`
`187`	`188`	`..fileOffset = offsetForToken(token);`
`188`	`189`	`}`
`189`	`190`