Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(259)

Unified Diff: pkg/analyzer/lib/src/summary/resynthesize.dart

Issue 2769703002: Revert "Issue 28580. Relax instantiate to bounds." (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/analyzer/lib/src/generated/resolver.dart ('k') | pkg/analyzer/lib/src/task/dart.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/summary/resynthesize.dart
diff --git a/pkg/analyzer/lib/src/summary/resynthesize.dart b/pkg/analyzer/lib/src/summary/resynthesize.dart
index 73f09c312803cbd43f08686ab6321eb1fb9dedc8..bd764d409841bab943ea72506f3eabaa8bd4def5 100644
--- a/pkg/analyzer/lib/src/summary/resynthesize.dart
+++ b/pkg/analyzer/lib/src/summary/resynthesize.dart
@@ -1294,7 +1294,8 @@ class _ReferenceInfo {
InterfaceTypeImpl type =
new InterfaceTypeImpl.elementWithNameAndArgs(element, name, () {
if (typeArguments == null) {
- if (libraryResynthesizer.summaryResynthesizer.strongMode) {
+ if (libraryResynthesizer.summaryResynthesizer.strongMode &&
+ instantiateToBoundsAllowed) {
InterfaceType instantiatedToBounds = libraryResynthesizer
.summaryResynthesizer.context.typeSystem
.instantiateToBounds(element.type) as InterfaceType;
@@ -1319,7 +1320,8 @@ class _ReferenceInfo {
if (numTypeArguments == numTypeParameters) {
typeArguments =
_buildTypeArguments(numTypeArguments, getTypeArgument);
- } else if (libraryResynthesizer.summaryResynthesizer.strongMode) {
+ } else if (libraryResynthesizer.summaryResynthesizer.strongMode &&
+ instantiateToBoundsAllowed) {
FunctionType instantiatedToBounds = libraryResynthesizer
.summaryResynthesizer.context.typeSystem
.instantiateToBounds(element.type) as FunctionType;
« no previous file with comments | « pkg/analyzer/lib/src/generated/resolver.dart ('k') | pkg/analyzer/lib/src/task/dart.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698