Don't serialize not serializable constant variable initializers.

scheglov · commit-bot@chromium.org · commit b565c8c20f9b · 2019-08-28T22:28:56.000Z
R=brianwilkerson@google.com Change-Id: If5287b11293391d8620b9843880b95f725efc5fa Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/114800 Commit-Queue: Konstantin Shcheglov <scheglov@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analyzer/lib/src/summary2/ast_binary_writer.dart b/pkg/analyzer/lib/src/summary2/ast_binary_writer.dart
@@ -1367,6 +1367,10 @@ class AstBinaryWriter extends ThrowingAstVisitor<LinkedNodeBuilder> {
       }
     }
 
+    if (!_isSerializableExpression(initializer)) {
+      initializer = null;
+    }
+
     var builder = LinkedNodeBuilder.variableDeclaration(
       informativeId: getInformativeId(node),
       variableDeclaration_initializer: initializer?.accept(this),
diff --git a/pkg/analyzer/test/generated/invalid_code_test.dart b/pkg/analyzer/test/generated/invalid_code_test.dart
@@ -152,6 +152,16 @@ void f({a = [for (@b c = 0;;)]}) {}
 ''');
   }
 
+  test_fuzz_13() async {
+    // `x is int` promotes the type of `x` to `S extends int`, and the
+    // underlying element is `TypeParameterMember`, which by itself is
+    // questionable.  But this is not a valid constant anyway, so we should
+    // not even try to serialize it.
+    await _assertCanBeAnalyzed(r'''
+const v = [<S extends num>(S x) => x is int ? x : 0];
+''');
+  }
+
   test_genericFunction_asTypeArgument_ofUnresolvedClass() async {
     await _assertCanBeAnalyzed(r'''
 C<int Function()> c;

Original file line number	Diff line number	Diff line change
`@@ -1367,6 +1367,10 @@ class AstBinaryWriter extends ThrowingAstVisitor<LinkedNodeBuilder> {`
`1367`	`1367`	`}`
`1368`	`1368`	`}`
`1369`	`1369`
	`1370`	`+ if (!_isSerializableExpression(initializer)) {`
	`1371`	`+ initializer = null;`
	`1372`	`+ }`
	`1373`	`+`
`1370`	`1374`	`var builder = LinkedNodeBuilder.variableDeclaration(`
`1371`	`1375`	`informativeId: getInformativeId(node),`
`1372`	`1376`	`variableDeclaration_initializer: initializer?.accept(this),`