Merge pull request github#13739 from owen-mc/go/extractor-use-origin

Use Origin() in Go extractor

Author: owen-mc

go/extractor/extractor.go

@@ -1946,48 +1946,14 @@ func populateTypeParamParents(tw *trap.Writer, typeparams *types.TypeParamList,
 // some changes to the object to avoid returning objects relating to instantiated
 // types.
 func getObjectBeingUsed(tw *trap.Writer, ident *ast.Ident) types.Object {
-	obj := tw.Package.TypesInfo.Uses[ident]
-	if obj == nil {
-		return nil
-	}
-	if override, ok := tw.ObjectsOverride[obj]; ok {
-		return override
-	}
-	if funcObj, ok := obj.(*types.Func); ok {
-		sig := funcObj.Type().(*types.Signature)
-		if recv := sig.Recv(); recv != nil {
-			recvType := recv.Type()
-			originType, isSame := tryGetGenericType(recvType)
-
-			if originType == nil {
-				if pointerType, ok := recvType.(*types.Pointer); ok {
-					originType, isSame = tryGetGenericType(pointerType.Elem())
-				}
-			}
-
-			if originType == nil || isSame {
-				return obj
-			}
-
-			for i := 0; i < originType.NumMethods(); i++ {
-				meth := originType.Method(i)
-				if meth.Name() == funcObj.Name() {
-					return meth
-				}
-			}
-			if interfaceType, ok := originType.Underlying().(*types.Interface); ok {
-				for i := 0; i < interfaceType.NumMethods(); i++ {
-					meth := interfaceType.Method(i)
-					if meth.Name() == funcObj.Name() {
-						return meth
-					}
-				}
-			}
-			log.Fatalf("Could not find method %s on type %s", funcObj.Name(), originType)
-		}
+	switch obj := tw.Package.TypesInfo.Uses[ident].(type) {
+	case *types.Var:
+		return obj.Origin()
+	case *types.Func:
+		return obj.Origin()
+	default:
+		return obj
 	}
-
-	return obj
 }
 
 // tryGetGenericType returns the generic type of `tp`, and a boolean indicating