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

Unified Diff: pkg/compiler/lib/src/resolution/members.dart

Issue 1068233002: Revert "Extract CallStructure from Selector." (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 8 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
Index: pkg/compiler/lib/src/resolution/members.dart
diff --git a/pkg/compiler/lib/src/resolution/members.dart b/pkg/compiler/lib/src/resolution/members.dart
index 00027ab9b34b7a8673ae1179784ee34a46e28a74..248f5a57eb0ef67aa5eb0340a6bf98d8ffb9b6fc 100644
--- a/pkg/compiler/lib/src/resolution/members.dart
+++ b/pkg/compiler/lib/src/resolution/members.dart
@@ -1500,7 +1500,7 @@ class InitializerResolver {
final String className = lookupTarget.name;
verifyThatConstructorMatchesCall(constructor,
calledConstructor,
- selector.callStructure,
+ selector,
isImplicitSuperCall,
call,
className,
@@ -1519,6 +1519,11 @@ class InitializerResolver {
if (classElement != visitor.compiler.objectClass) {
assert(superClass != null);
assert(superClass.resolutionState == STATE_DONE);
+ String constructorName = '';
+ Selector callToMatch = new Selector.call(
+ constructorName,
+ classElement.library,
+ 0);
final bool isSuperCall = true;
ClassElement lookupTarget = getSuperOrThisLookupTarget(constructor,
@@ -1532,7 +1537,7 @@ class InitializerResolver {
final bool isImplicitSuperCall = true;
verifyThatConstructorMatchesCall(constructor,
calledConstructor,
- CallStructure.NO_ARGS,
+ callToMatch,
isImplicitSuperCall,
functionNode,
className,
@@ -1545,7 +1550,7 @@ class InitializerResolver {
void verifyThatConstructorMatchesCall(
FunctionElement caller,
ConstructorElementX lookedupConstructor,
- CallStructure call,
+ Selector call,
bool isImplicitSuperCall,
Node diagnosticNode,
String className,
@@ -1562,7 +1567,7 @@ class InitializerResolver {
diagnosticNode, kind, {'constructorName': fullConstructorName});
} else {
lookedupConstructor.computeSignature(visitor.compiler);
- if (!call.signatureApplies(lookedupConstructor)) {
+ if (!call.applies(lookedupConstructor, visitor.compiler.world)) {
MessageKind kind = isImplicitSuperCall
? MessageKind.NO_MATCHING_CONSTRUCTOR_FOR_IMPLICIT
: MessageKind.NO_MATCHING_CONSTRUCTOR;
« no previous file with comments | « pkg/compiler/lib/src/js_emitter/program_builder.dart ('k') | pkg/compiler/lib/src/resolution/resolution.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698