[cfe] Use origin location for member signatures

This is relanding https://dart-review.googlesource.com/c/sdk/+/168203
after it was reverted due to a problem in
https://dart-review.googlesource.com/c/sdk/+/168200

Change-Id: Id70d3e960b1edf1c5cdf92518b8e476084b1bb49
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/168645
Commit-Queue: Johnni Winther <[email protected]>
Reviewed-by: Dmitry Stefantsov <[email protected]>

Author: johnniwinther

pkg/front_end/lib/src/fasta/kernel/combined_member_signature.dart

@@ -311,7 +311,7 @@ abstract class CombinedMemberSignatureBase<T> {
 
   /// Create a member signature with the [combinedMemberSignatureType] using the
   /// [canonicalMember] as member signature origin.
-  Procedure createMemberFromSignature({bool copyLocation: true}) {
+  Procedure createMemberFromSignature() {
     if (canonicalMemberIndex == null) {
       return null;
     }
@@ -320,21 +320,18 @@ abstract class CombinedMemberSignatureBase<T> {
       switch (member.kind) {
         case ProcedureKind.Getter:
           return _createGetterMemberSignature(
-              member, combinedMemberSignatureType,
-              copyLocation: copyLocation);
+              member, combinedMemberSignatureType);
         case ProcedureKind.Setter:
           VariableDeclaration parameter =
               member.function.positionalParameters.first;
           return _createSetterMemberSignature(
               member, combinedMemberSignatureType,
               isGenericCovariantImpl: parameter.isGenericCovariantImpl,
               isCovariant: parameter.isCovariant,
-              parameterName: parameter.name,
-              copyLocation: copyLocation);
+              parameterName: parameter.name);
         case ProcedureKind.Method:
         case ProcedureKind.Operator:
-          return _createMethodSignature(member, combinedMemberSignatureType,
-              copyLocation: copyLocation);
+          return _createMethodSignature(member, combinedMemberSignatureType);
         case ProcedureKind.Factory:
         default:
           throw new UnsupportedError(
@@ -344,11 +341,10 @@ abstract class CombinedMemberSignatureBase<T> {
       if (forSetter) {
         return _createSetterMemberSignature(member, combinedMemberSignatureType,
             isGenericCovariantImpl: member.isGenericCovariantImpl,
-            isCovariant: member.isCovariant,
-            copyLocation: copyLocation);
+            isCovariant: member.isCovariant);
       } else {
-        return _createGetterMemberSignature(member, combinedMemberSignatureType,
-            copyLocation: copyLocation);
+        return _createGetterMemberSignature(
+            member, combinedMemberSignatureType);
       }
     } else {
       throw new UnsupportedError(
@@ -358,27 +354,17 @@ abstract class CombinedMemberSignatureBase<T> {
 
   /// Creates a getter member signature for [member] with the given
   /// [type].
-  Member _createGetterMemberSignature(Member member, DartType type,
-      {bool copyLocation}) {
-    assert(copyLocation != null);
+  Member _createGetterMemberSignature(Member member, DartType type) {
     Class enclosingClass = classBuilder.cls;
     Procedure referenceFrom;
     if (classBuilder.referencesFromIndexed != null) {
       referenceFrom = classBuilder.referencesFromIndexed
           .lookupProcedureNotSetter(member.name.text);
     }
-    Uri fileUri;
-    int startFileOffset;
-    int fileOffset;
-    if (copyLocation) {
-      fileUri = member.fileUri;
-      startFileOffset =
-          member is Procedure ? member.startFileOffset : member.fileOffset;
-      fileOffset = member.fileOffset;
-    } else {
-      fileUri = enclosingClass.fileUri;
-      startFileOffset = fileOffset = enclosingClass.fileOffset;
-    }
+    Uri fileUri = member.fileUri;
+    int startFileOffset =
+        member is Procedure ? member.startFileOffset : member.fileOffset;
+    int fileOffset = member.fileOffset;
     return new Procedure(member.name, ProcedureKind.Getter,
         new FunctionNode(null, returnType: type),
         isAbstract: true,
@@ -395,31 +381,19 @@ abstract class CombinedMemberSignatureBase<T> {
   /// [type]. The flags of parameter is set according to [isCovariant] and
   /// [isGenericCovariantImpl] and the [parameterName] is used, if provided.
   Member _createSetterMemberSignature(Member member, DartType type,
-      {bool isCovariant,
-      bool isGenericCovariantImpl,
-      String parameterName,
-      bool copyLocation}) {
+      {bool isCovariant, bool isGenericCovariantImpl, String parameterName}) {
     assert(isCovariant != null);
     assert(isGenericCovariantImpl != null);
-    assert(copyLocation != null);
     Class enclosingClass = classBuilder.cls;
     Procedure referenceFrom;
     if (classBuilder.referencesFromIndexed != null) {
       referenceFrom = classBuilder.referencesFromIndexed
           .lookupProcedureSetter(member.name.text);
     }
-    Uri fileUri;
-    int startFileOffset;
-    int fileOffset;
-    if (copyLocation) {
-      fileUri = member.fileUri;
-      startFileOffset =
-          member is Procedure ? member.startFileOffset : member.fileOffset;
-      fileOffset = member.fileOffset;
-    } else {
-      fileUri = enclosingClass.fileUri;
-      startFileOffset = fileOffset = enclosingClass.fileOffset;
-    }
+    Uri fileUri = member.fileUri;
+    int startFileOffset =
+        member is Procedure ? member.startFileOffset : member.fileOffset;
+    int fileOffset = member.fileOffset;
     return new Procedure(
         member.name,
         ProcedureKind.Setter,
@@ -440,26 +414,17 @@ abstract class CombinedMemberSignatureBase<T> {
       ..parent = enclosingClass;
   }
 
-  Member _createMethodSignature(Procedure procedure, FunctionType functionType,
-      {bool copyLocation}) {
-    assert(copyLocation != null);
+  Member _createMethodSignature(
+      Procedure procedure, FunctionType functionType) {
     Class enclosingClass = classBuilder.cls;
     Procedure referenceFrom;
     if (classBuilder.referencesFromIndexed != null) {
       referenceFrom = classBuilder.referencesFromIndexed
           .lookupProcedureNotSetter(procedure.name.text);
     }
-    Uri fileUri;
-    int startFileOffset;
-    int fileOffset;
-    if (copyLocation) {
-      fileUri = procedure.fileUri;
-      startFileOffset = procedure.startFileOffset;
-      fileOffset = procedure.fileOffset;
-    } else {
-      fileUri = enclosingClass.fileUri;
-      startFileOffset = fileOffset = enclosingClass.fileOffset;
-    }
+    Uri fileUri = procedure.fileUri;
+    int startFileOffset = procedure.startFileOffset;
+    int fileOffset = procedure.fileOffset;
     FunctionNode function = procedure.function;
     List<VariableDeclaration> positionalParameters = [];
     for (int i = 0; i < function.positionalParameters.length; i++) {

pkg/front_end/lib/src/fasta/kernel/forwarding_node.dart

@@ -98,10 +98,7 @@ class ForwardingNode {
       // Covariance can only come from [interfaceMember] so we never need a
       // forwarding stub.
       if (_combinedMemberSignature.neededLegacyErasure) {
-        return _combinedMemberSignature.createMemberFromSignature(
-            // TODO(johnniwinther): Change member signatures to use location
-            // of origin.
-            copyLocation: false);
+        return _combinedMemberSignature.createMemberFromSignature();
       } else {
         // Nothing to do.
         return interfaceMember;

pkg/front_end/testcases/extensions/ambiguous.dart.outline.expect

@@ -5,16 +5,16 @@ import "dart:core" as core;
 class C extends core::Object {
   synthetic constructor •() → self::C*
     ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
+  abstract member-signature get /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _identityHashCode() → core::int*; -> core::Object::_identityHashCode
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
+  abstract member-signature operator /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ ==(dynamic other) → core::bool*; -> core::Object::==
+  abstract member-signature get /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ hashCode() → core::int*; -> core::Object::hashCode
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ toString() → core::String*; -> core::Object::toString
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
+  abstract member-signature get /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ runtimeType() → core::Type*; -> core::Object::runtimeType
 }
 extension A on self::C* {
   method method = self::A|method;

pkg/front_end/testcases/extensions/ambiguous.dart.strong.expect

@@ -153,16 +153,16 @@ class C extends core::Object {
   synthetic constructor •() → self::C*
     : super core::Object::•()
     ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
+  abstract member-signature get /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _identityHashCode() → core::int*; -> core::Object::_identityHashCode
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
+  abstract member-signature operator /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ ==(dynamic other) → core::bool*; -> core::Object::==
+  abstract member-signature get /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ hashCode() → core::int*; -> core::Object::hashCode
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ toString() → core::String*; -> core::Object::toString
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
+  abstract member-signature get /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ runtimeType() → core::Type*; -> core::Object::runtimeType
 }
 extension A on self::C* {
   method method = self::A|method;

pkg/front_end/testcases/extensions/ambiguous.dart.strong.transformed.expect

@@ -153,16 +153,16 @@ class C extends core::Object {
   synthetic constructor •() → self::C*
     : super core::Object::•()
     ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
+  abstract member-signature get /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _identityHashCode() → core::int*; -> core::Object::_identityHashCode
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
+  abstract member-signature operator /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ ==(dynamic other) → core::bool*; -> core::Object::==
+  abstract member-signature get /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ hashCode() → core::int*; -> core::Object::hashCode
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ toString() → core::String*; -> core::Object::toString
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
+  abstract member-signature get /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ runtimeType() → core::Type*; -> core::Object::runtimeType
 }
 extension A on self::C* {
   method method = self::A|method;

pkg/front_end/testcases/extensions/annotations.dart.outline.expect

@@ -11,16 +11,16 @@ class Class extends core::Object {
   @core::pragma::_("dart2js:noInline")
   static method staticMethod() → dynamic
     ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
+  abstract member-signature get /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _identityHashCode() → core::int*; -> core::Object::_identityHashCode
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
+  abstract member-signature operator /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ ==(dynamic other) → core::bool*; -> core::Object::==
+  abstract member-signature get /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ hashCode() → core::int*; -> core::Object::hashCode
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ toString() → core::String*; -> core::Object::toString
+  abstract member-signature method /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
+  abstract member-signature get /* from org-dartlang-sdk:///sdk/lib/_internal/vm/lib/object_patch.dart */ runtimeType() → core::Type*; -> core::Object::runtimeType
 }
 extension Extension on self::Class* {
   method extensionInstanceMethod = self::Extension|extensionInstanceMethod;