[CFE] getFormal via Identifier (name and offset) and not just String (name)

jensjoha · commit-bot@chromium.org · commit 06e6554d2e32 · 2019-11-18T13:48:53.000Z
Change-Id: I78059e627edaf8876eee74f878b36cfce990b78f Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/125265 Commit-Queue: Jens Johansen <jensj@google.com> Reviewed-by: Johnni Winther <johnniwinther@google.com>
diff --git a/pkg/front_end/lib/src/fasta/builder/function_builder.dart b/pkg/front_end/lib/src/fasta/builder/function_builder.dart
@@ -11,6 +11,7 @@ import 'package:kernel/ast.dart';
 
 import 'package:kernel/type_algebra.dart';
 
+import '../identifiers.dart';
 import '../scope.dart';
 
 import '../kernel/class_hierarchy_builder.dart' show ClassMember;
@@ -87,7 +88,7 @@ abstract class FunctionBuilder implements MemberBuilder {
   /// to support generic methods.
   Scope computeTypeParameterScope(Scope parent);
 
-  FormalParameterBuilder getFormal(String name);
+  FormalParameterBuilder getFormal(Identifier identifier);
 
   String get nativeMethodName;
 
@@ -274,11 +275,16 @@ abstract class FunctionBuilderImpl extends MemberBuilderImpl
   }
 
   @override
-  FormalParameterBuilder getFormal(String name) {
+  FormalParameterBuilder getFormal(Identifier identifier) {
     if (formals != null) {
       for (FormalParameterBuilder formal in formals) {
-        if (formal.name == name) return formal;
+        if (formal.name == identifier.name &&
+            formal.charOffset == identifier.charOffset) {
+          return formal;
+        }
       }
+      // If we have any formals we should find the one we're looking for.
+      assert(false, "$identifier not found in $formals");
     }
     return null;
   }
diff --git a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
@@ -3162,8 +3162,10 @@ class BodyBuilder extends ScopeListener<JumpTarget>
         functionNestingLevel == 0 &&
         memberKind != MemberKind.GeneralizedFunctionType) {
       FunctionBuilder member = this.member;
-      parameter = member.getFormal(name.name);
+      parameter = member.getFormal(name);
       if (parameter == null) {
+        // This happens when the list of formals (originally) contains a
+        // ParserRecovery - then the popped list becomes null.
         push(new ParserRecovery(nameToken.charOffset));
         return;
       }
diff --git a/pkg/front_end/testcases/general/error_locations/error_location_05.dart.strong.expect b/pkg/front_end/testcases/general/error_locations/error_location_05.dart.strong.expect
@@ -20,7 +20,7 @@ import self as self;
 import "dart:core" as core;
 
 part error_location_05_lib1.dart;
-static method /* from org-dartlang-testcase:///error_location_05_lib1.dart */ x1(dynamic z = #C1, {dynamic z = #C1}) → dynamic {}
+static method /* from org-dartlang-testcase:///error_location_05_lib1.dart */ x1(dynamic z, {dynamic z = #C1}) → dynamic {}
 static method /* from org-dartlang-testcase:///error_location_05_lib1.dart */ x2() → dynamic {
   function y(dynamic z, {dynamic z = #C1}) → core::Null? {}
 }
diff --git a/pkg/front_end/testcases/general/error_locations/error_location_05.dart.strong.transformed.expect b/pkg/front_end/testcases/general/error_locations/error_location_05.dart.strong.transformed.expect
@@ -20,7 +20,7 @@ import self as self;
 import "dart:core" as core;
 
 part error_location_05_lib1.dart;
-static method /* from org-dartlang-testcase:///error_location_05_lib1.dart */ x1(dynamic z = #C1, {dynamic z = #C1}) → dynamic {}
+static method /* from org-dartlang-testcase:///error_location_05_lib1.dart */ x1(dynamic z, {dynamic z = #C1}) → dynamic {}
 static method /* from org-dartlang-testcase:///error_location_05_lib1.dart */ x2() → dynamic {
   function y(dynamic z, {dynamic z = #C1}) → core::Null? {}
 }
diff --git a/pkg/front_end/testcases/general/error_locations/error_location_06.dart.strong.expect b/pkg/front_end/testcases/general/error_locations/error_location_06.dart.strong.expect
@@ -20,7 +20,7 @@ import self as self;
 import "dart:core" as core;
 
 part error_location_06_lib1.dart;
-static method /* from org-dartlang-testcase:///error_location_06_lib1.dart */ x1(dynamic z = #C1, {dynamic z = #C1}) → dynamic {}
+static method /* from org-dartlang-testcase:///error_location_06_lib1.dart */ x1(dynamic z, {dynamic z = #C1}) → dynamic {}
 static method /* from org-dartlang-testcase:///error_location_06_lib1.dart */ x2() → dynamic {
   function y(dynamic z, {dynamic z = #C1}) → core::Null? {}
 }
diff --git a/pkg/front_end/testcases/general/error_locations/error_location_06.dart.strong.transformed.expect b/pkg/front_end/testcases/general/error_locations/error_location_06.dart.strong.transformed.expect
@@ -20,7 +20,7 @@ import self as self;
 import "dart:core" as core;
 
 part error_location_06_lib1.dart;
-static method /* from org-dartlang-testcase:///error_location_06_lib1.dart */ x1(dynamic z = #C1, {dynamic z = #C1}) → dynamic {}
+static method /* from org-dartlang-testcase:///error_location_06_lib1.dart */ x1(dynamic z, {dynamic z = #C1}) → dynamic {}
 static method /* from org-dartlang-testcase:///error_location_06_lib1.dart */ x2() → dynamic {
   function y(dynamic z, {dynamic z = #C1}) → core::Null? {}
 }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import self as self;`
`20`	`20`	`import "dart:core" as core;`
`21`	`21`
`22`	`22`	`part error_location_05_lib1.dart;`
`23`		`-static method /* from org-dartlang-testcase:///error_location_05_lib1.dart */ x1(dynamic z = #C1, {dynamic z = #C1}) → dynamic {}`
	`23`	`+static method /* from org-dartlang-testcase:///error_location_05_lib1.dart */ x1(dynamic z, {dynamic z = #C1}) → dynamic {}`
`24`	`24`	`static method /* from org-dartlang-testcase:///error_location_05_lib1.dart */ x2() → dynamic {`
`25`	`25`	`function y(dynamic z, {dynamic z = #C1}) → core::Null? {}`
`26`	`26`	`}`