Don't compare typeArguments for FunctionType(s) equality.
Change-Id: I9245de1cc16f912af2141dee34b03f401d89a534
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/106240
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analyzer/lib/src/dart/element/type.dart b/pkg/analyzer/lib/src/dart/element/type.dart
index d82c4ed..27dd52e 100644
--- a/pkg/analyzer/lib/src/dart/element/type.dart
+++ b/pkg/analyzer/lib/src/dart/element/type.dart
@@ -13,7 +13,6 @@
show AnalysisContext, AnalysisEngine;
import 'package:analyzer/src/generated/resolver.dart';
import 'package:analyzer/src/generated/type_system.dart';
-import 'package:analyzer/src/generated/utilities_collection.dart';
import 'package:analyzer/src/generated/utilities_dart.dart';
import 'package:analyzer/src/summary/resynthesize.dart'
show RecursiveInstantiateToBounds;
@@ -725,8 +724,7 @@
normalParameterTypes, object.normalParameterTypes) &&
TypeImpl.equalArrays(
optionalParameterTypes, object.optionalParameterTypes) &&
- _equals(namedParameterTypes, object.namedParameterTypes) &&
- TypeImpl.equalArrays(typeArguments, object.typeArguments);
+ _equals(namedParameterTypes, object.namedParameterTypes);
}
return false;
}
@@ -2262,9 +2260,6 @@
List<DartType> newTypeArguments = TypeImpl.substitute(
typeArguments, argumentTypes, parameterTypes, prune);
- if (listsEqual(newTypeArguments, typeArguments)) {
- return this;
- }
InterfaceTypeImpl newType =
new InterfaceTypeImpl(element, prune, nullabilitySuffix);
diff --git a/tests/compiler/dartdevc_native/debugger/debugger_test_golden.txt b/tests/compiler/dartdevc_native/debugger/debugger_test_golden.txt
index b18cfc5..0b12aa0 100644
--- a/tests/compiler/dartdevc_native/debugger/debugger_test_golden.txt
+++ b/tests/compiler/dartdevc_native/debugger/debugger_test_golden.txt
@@ -1624,34 +1624,6 @@
{
"style": "background-color: thistle; color: rgb(136, 19, 145); margin-right: -13px"
},
- "toString: "
- ],
- [
- "span",
- {
- "style": "margin-left: 13px"
- },
- [
- "object",
- {
- "object": "<OBJECT>",
- "config": {
- "name": "none"
- }
- }
- ]
- ]
- ],
- [
- "li",
- {
- "style": "padding-left: 13px;"
- },
- [
- "span",
- {
- "style": "background-color: thistle; color: rgb(136, 19, 145); margin-right: -13px"
- },
"where: "
],
[
@@ -1708,34 +1680,6 @@
{
"style": "background-color: thistle; color: rgb(136, 19, 145); margin-right: -13px"
},
- "_equals: "
- ],
- [
- "span",
- {
- "style": "margin-left: 13px"
- },
- [
- "object",
- {
- "object": "<OBJECT>",
- "config": {
- "name": "none"
- }
- }
- ]
- ]
- ],
- [
- "li",
- {
- "style": "padding-left: 13px;"
- },
- [
- "span",
- {
- "style": "background-color: thistle; color: rgb(136, 19, 145); margin-right: -13px"
- },
"_get: "
],
[
@@ -3317,34 +3261,6 @@
{
"style": "background-color: thistle; color: rgb(136, 19, 145); margin-right: -13px"
},
- "toString: "
- ],
- [
- "span",
- {
- "style": "margin-left: 13px"
- },
- [
- "object",
- {
- "object": "<OBJECT>",
- "config": {
- "name": "none"
- }
- }
- ]
- ]
- ],
- [
- "li",
- {
- "style": "padding-left: 13px;"
- },
- [
- "span",
- {
- "style": "background-color: thistle; color: rgb(136, 19, 145); margin-right: -13px"
- },
"where: "
],
[
@@ -3401,34 +3317,6 @@
{
"style": "background-color: thistle; color: rgb(136, 19, 145); margin-right: -13px"
},
- "_equals: "
- ],
- [
- "span",
- {
- "style": "margin-left: 13px"
- },
- [
- "object",
- {
- "object": "<OBJECT>",
- "config": {
- "name": "none"
- }
- }
- ]
- ]
- ],
- [
- "li",
- {
- "style": "padding-left: 13px;"
- },
- [
- "span",
- {
- "style": "background-color: thistle; color: rgb(136, 19, 145); margin-right: -13px"
- },
"_get: "
],
[
