Use the inferred type of const lists/maps to for constant evaluation.
This addresses one of the root causes of #33304. Note that when a
constant list or map is recorded in a summary, we don't encode enough
information in the summary to resynthesize its inferred type
correctly, so this only fixes cases where the constant is used in the
same build unit as its declaration.
Change-Id: Id0034f481cb82f18c77bbe2ee8ebec7e8b244caa
Reviewed-on: https://dart-review.googlesource.com/60203
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Paul Berry <paulberry@google.com>
diff --git a/pkg/analyzer/lib/src/dart/constant/evaluation.dart b/pkg/analyzer/lib/src/dart/constant/evaluation.dart
index 410a1f0..b65aa46 100644
--- a/pkg/analyzer/lib/src/dart/constant/evaluation.dart
+++ b/pkg/analyzer/lib/src/dart/constant/evaluation.dart
@@ -1409,14 +1409,11 @@
if (errorOccurred) {
return null;
}
- DartType elementType = _typeProvider.dynamicType;
- NodeList<TypeAnnotation> typeArgs = node.typeArguments?.arguments;
- if (typeArgs?.length == 1) {
- DartType type = visitTypeAnnotation(typeArgs[0])?.toTypeValue();
- if (type != null) {
- elementType = type;
- }
- }
+ var nodeType = node.staticType;
+ DartType elementType =
+ nodeType is InterfaceType && nodeType.typeArguments.isNotEmpty
+ ? nodeType.typeArguments[0]
+ : _typeProvider.dynamicType;
InterfaceType listType = _typeProvider.listType.instantiate([elementType]);
return new DartObjectImpl(listType, new ListState(elements));
}
@@ -1445,17 +1442,12 @@
}
DartType keyType = _typeProvider.dynamicType;
DartType valueType = _typeProvider.dynamicType;
- NodeList<TypeAnnotation> typeArgs = node.typeArguments?.arguments;
- if (typeArgs?.length == 2) {
- DartType keyTypeCandidate =
- visitTypeAnnotation(typeArgs[0])?.toTypeValue();
- if (keyTypeCandidate != null) {
- keyType = keyTypeCandidate;
- }
- DartType valueTypeCandidate =
- visitTypeAnnotation(typeArgs[1])?.toTypeValue();
- if (valueTypeCandidate != null) {
- valueType = valueTypeCandidate;
+ var nodeType = node.staticType;
+ if (nodeType is InterfaceType) {
+ var typeArguments = nodeType.typeArguments;
+ if (typeArguments.length >= 2) {
+ keyType = typeArguments[0];
+ valueType = typeArguments[1];
}
}
InterfaceType mapType =
diff --git a/pkg/analyzer/lib/src/dart/constant/utilities.dart b/pkg/analyzer/lib/src/dart/constant/utilities.dart
index 7e47780..95c7f18 100644
--- a/pkg/analyzer/lib/src/dart/constant/utilities.dart
+++ b/pkg/analyzer/lib/src/dart/constant/utilities.dart
@@ -83,6 +83,7 @@
@override
ListLiteral visitListLiteral(ListLiteral node) {
ListLiteral literal = super.visitListLiteral(node);
+ literal.staticType = node.staticType;
if (previewDart2 && node.constKeyword == null && node.isConst) {
literal.constKeyword = new KeywordToken(Keyword.CONST, node.offset);
}
@@ -92,6 +93,7 @@
@override
MapLiteral visitMapLiteral(MapLiteral node) {
MapLiteral literal = super.visitMapLiteral(node);
+ literal.staticType = node.staticType;
if (previewDart2 && node.constKeyword == null && node.isConst) {
literal.constKeyword = new KeywordToken(Keyword.CONST, node.offset);
}
diff --git a/pkg/analyzer/test/generated/checked_mode_compile_time_error_code_test.dart b/pkg/analyzer/test/generated/checked_mode_compile_time_error_code_test.dart
index 746ca53..1d350f0 100644
--- a/pkg/analyzer/test/generated/checked_mode_compile_time_error_code_test.dart
+++ b/pkg/analyzer/test/generated/checked_mode_compile_time_error_code_test.dart
@@ -492,6 +492,18 @@
verify([source]);
}
+ test_listLiteral_inferredElementType() async {
+ resetWith(options: new AnalysisOptionsImpl()..strongMode = true);
+ Source source = addSource('''
+const Object x = [1];
+const List<String> y = x;
+''');
+ await computeAnalysisResult(source);
+ assertErrors(
+ source, [CheckedModeCompileTimeErrorCode.VARIABLE_TYPE_MISMATCH]);
+ verify([source]);
+ }
+
test_mapKeyTypeNotAssignable() async {
Source source = addSource("var v = const <String, int > {1 : 2};");
await computeAnalysisResult(source);
@@ -502,6 +514,30 @@
verify([source]);
}
+ test_mapLiteral_inferredKeyType() async {
+ resetWith(options: new AnalysisOptionsImpl()..strongMode = true);
+ Source source = addSource('''
+const Object x = {1: 1};
+const Map<String, dynamic> y = x;
+''');
+ await computeAnalysisResult(source);
+ assertErrors(
+ source, [CheckedModeCompileTimeErrorCode.VARIABLE_TYPE_MISMATCH]);
+ verify([source]);
+ }
+
+ test_mapLiteral_inferredValueType() async {
+ resetWith(options: new AnalysisOptionsImpl()..strongMode = true);
+ Source source = addSource('''
+const Object x = {1: 1};
+const Map<dynamic, String> y = x;
+''');
+ await computeAnalysisResult(source);
+ assertErrors(
+ source, [CheckedModeCompileTimeErrorCode.VARIABLE_TYPE_MISMATCH]);
+ verify([source]);
+ }
+
test_mapValueTypeNotAssignable() async {
Source source = addSource("var v = const <String, String> {'a' : 2};");
await computeAnalysisResult(source);
diff --git a/pkg/analyzer/test/src/summary/resynthesize_ast_test.dart b/pkg/analyzer/test/src/summary/resynthesize_ast_test.dart
index 2965261..891b523 100644
--- a/pkg/analyzer/test/src/summary/resynthesize_ast_test.dart
+++ b/pkg/analyzer/test/src/summary/resynthesize_ast_test.dart
@@ -183,7 +183,13 @@
@failingTest // See dartbug.com/32290
test_const_constructor_inferred_args() =>
- test_const_constructor_inferred_args();
+ super.test_const_constructor_inferred_args();
+
+ @failingTest // See dartbug.com/33441
+ test_const_list_inferredType() => super.test_const_list_inferredType();
+
+ @failingTest // See dartbug.com/33441
+ test_const_map_inferredType() => super.test_const_map_inferredType();
@override
@failingTest
diff --git a/pkg/analyzer/test/src/summary/resynthesize_common.dart b/pkg/analyzer/test/src/summary/resynthesize_common.dart
index dd8e30b..88a7e76 100644
--- a/pkg/analyzer/test/src/summary/resynthesize_common.dart
+++ b/pkg/analyzer/test/src/summary/resynthesize_common.dart
@@ -3297,6 +3297,35 @@
}
}
+ test_const_list_inferredType() async {
+ if (!isStrongMode) return;
+ // The summary needs to contain enough information so that when the constant
+ // is resynthesized, the constant value can get the type that was computed
+ // by type inference.
+ var library = await checkLibrary('''
+const Object x = const [1];
+''');
+ checkElementText(library, '''
+const Object x = const <
+ int/*location: dart:core;int*/>[1];
+''');
+ }
+
+ test_const_map_inferredType() async {
+ if (!isStrongMode) return;
+ // The summary needs to contain enough information so that when the constant
+ // is resynthesized, the constant value can get the type that was computed
+ // by type inference.
+ var library = await checkLibrary('''
+const Object x = const {1: 1.0};
+''');
+ checkElementText(library, '''
+const Object x = const <
+ int/*location: dart:core;int*/,
+ double/*location: dart:core;double*/>{1: 1.0};
+''');
+ }
+
test_const_parameterDefaultValue_initializingFormal_functionTyped() async {
var library = await checkLibrary(r'''
class C {
diff --git a/pkg/analyzer/test/src/summary/resynthesize_kernel_test.dart b/pkg/analyzer/test/src/summary/resynthesize_kernel_test.dart
index 707aa7e..9a2a5e1 100644
--- a/pkg/analyzer/test/src/summary/resynthesize_kernel_test.dart
+++ b/pkg/analyzer/test/src/summary/resynthesize_kernel_test.dart
@@ -147,7 +147,7 @@
@failingTest // See dartbug.com/32290
test_const_constructor_inferred_args() =>
- test_const_constructor_inferred_args();
+ super.test_const_constructor_inferred_args();
@failingTest
@FastaProblem('https://github.com/dart-lang/sdk/issues/30258')
diff --git a/pkg/analyzer/test/src/task/strong/checker_test.dart b/pkg/analyzer/test/src/task/strong/checker_test.dart
index 2228fa0..9aa47e4 100644
--- a/pkg/analyzer/test/src/task/strong/checker_test.dart
+++ b/pkg/analyzer/test/src/task/strong/checker_test.dart
@@ -349,6 +349,7 @@
''');
}
+ @failingTest // See dartbug.com/33440
test_constantGenericTypeArg_explicit() async {
// Regression test for https://github.com/dart-lang/sdk/issues/26141
await checkFile('''
@@ -375,6 +376,7 @@
''');
}
+ @failingTest // See dartbug.com/32918
test_constantGenericTypeArg_infer() async {
// Regression test for https://github.com/dart-lang/sdk/issues/26141
await checkFile('''
