all: merge master (86c93e8) into gopls-release-branch.0.12

Also add back the x/tools replace directive.

For golang/go#60563

Merge List:

+ 2023-06-01 86c93e8 gopls: unimported completion should use the completion matcher
+ 2023-06-01 04ceacb gopls/internal/lsp/source: fix panic in typeDefinition on comparable
+ 2023-06-01 947adca gopls/internal/lsp/source/methodsets: comparable also has no package
+ 2023-06-01 c35c44f gopls/internal/lsp/cache: add assertions
+ 2023-06-01 0b4461b internal/diff: fix LineEdits bug in slow path
+ 2023-06-01 1943c1e internal/diff: fix LineEdits bug in fast path
+ 2023-06-01 c6d86c4 go/pointer: delete package
+ 2023-06-01 77fd064 go/types/objectpath: remove unnecessary unsafe import
+ 2023-06-01 0dda7d6 go/pointer: remove replace directive
+ 2023-05-31 98f1b4d gopls/internal/lsp/cache: check number of orphaned files after filtering
+ 2023-05-31 a260315 go/pointer: create submodule
+ 2023-05-31 96844c3 cmd/{guru,callgraph}: stop using go/pointer
+ 2023-05-31 cd694d8 go/packages: include "unsafe".GoFiles=["unsafe.go"]
+ 2023-05-30 33c741d gopls/internal/lsp: add min/max builtin
+ 2023-05-30 933c7cc internal/lsp/source: use exact match in import highlighting
+ 2023-05-26 5974258 gopls/internal/lsp: clear vuln diagnostics on config changes
+ 2023-05-26 f3faea1 go/packages: pass -pgo=off on go1.21 and later
+ 2023-05-26 5f74ec7 internal/lsp/debug: add links to profiles and GC
+ 2023-05-25 ed90c6d internal/diff: unexport various identifiers
+ 2023-05-25 827f5aa gopls/internal/lsp/source: test references bug on struct{p.T}
+ 2023-05-24 a12e1a6 go/ssa/interp: implement min/max builtins

Change-Id: I1987a4b6f6d3b2727976a7a8f5766921738eb7f7

Author: findleyr

cmd/callgraph/main.go

@@ -20,14 +20,12 @@ package main // import "golang.org/x/tools/cmd/callgraph"
 //     callee file/line/col
 
 import (
-	"bufio"
 	"bytes"
 	"flag"
 	"fmt"
 	"go/build"
 	"go/token"
 	"io"
-	"log"
 	"os"
 	"runtime"
 	"text/template"
@@ -39,25 +37,21 @@ import (
 	"golang.org/x/tools/go/callgraph/static"
 	"golang.org/x/tools/go/callgraph/vta"
 	"golang.org/x/tools/go/packages"
-	"golang.org/x/tools/go/pointer"
 	"golang.org/x/tools/go/ssa"
 	"golang.org/x/tools/go/ssa/ssautil"
 )
 
 // flags
 var (
 	algoFlag = flag.String("algo", "rta",
-		`Call graph construction algorithm (static, cha, rta, vta, pta)`)
+		`Call graph construction algorithm (static, cha, rta, vta)`)
 
 	testFlag = flag.Bool("test", false,
 		"Loads test code (*_test.go) for imported packages")
 
 	formatFlag = flag.String("format",
 		"{{.Caller}}\t--{{.Dynamic}}-{{.Line}}:{{.Column}}-->\t{{.Callee}}",
 		"A template expression specifying how to format an edge")
-
-	ptalogFlag = flag.String("ptalog", "",
-		"Location of the points-to analysis log file, or empty to disable logging.")
 )
 
 func init() {
@@ -68,7 +62,7 @@ const Usage = `callgraph: display the call graph of a Go program.
 
 Usage:
 
-  callgraph [-algo=static|cha|rta|vta|pta] [-test] [-format=...] package...
+  callgraph [-algo=static|cha|rta|vta] [-test] [-format=...] package...
 
 Flags:
 
@@ -78,11 +72,10 @@ Flags:
             cha         Class Hierarchy Analysis
             rta         Rapid Type Analysis
             vta         Variable Type Analysis
-            pta         inclusion-based Points-To Analysis
 
            The algorithms are ordered by increasing precision in their
            treatment of dynamic calls (and thus also computational cost).
-           RTA and PTA require a whole program (main or test), and
+           RTA requires a whole program (main or test), and
            include only functions reachable from main.
 
 -test      Include the package's tests in the analysis.
@@ -132,9 +125,9 @@ Examples:
       $GOROOT/src/net/http/triv.go | sort | uniq
 
   Show functions that make dynamic calls into the 'fmt' test package,
-  using the pointer analysis algorithm:
+  using the Rapid Type Analysis algorithm:
 
-    callgraph -format='{{.Caller}} -{{.Dynamic}}-> {{.Callee}}' -test -algo=pta fmt |
+    callgraph -format='{{.Caller}} -{{.Dynamic}}-> {{.Callee}}' -test -algo=rta fmt |
       sed -ne 's/-dynamic-/--/p' |
       sed -ne 's/-->.*fmt_test.*$//p' | sort | uniq
 
@@ -205,39 +198,7 @@ func doCallgraph(dir, gopath, algo, format string, tests bool, args []string) er
 		cg = cha.CallGraph(prog)
 
 	case "pta":
-		// Set up points-to analysis log file.
-		var ptalog io.Writer
-		if *ptalogFlag != "" {
-			if f, err := os.Create(*ptalogFlag); err != nil {
-				log.Fatalf("Failed to create PTA log file: %s", err)
-			} else {
-				buf := bufio.NewWriter(f)
-				ptalog = buf
-				defer func() {
-					if err := buf.Flush(); err != nil {
-						log.Printf("flush: %s", err)
-					}
-					if err := f.Close(); err != nil {
-						log.Printf("close: %s", err)
-					}
-				}()
-			}
-		}
-
-		mains, err := mainPackages(pkgs)
-		if err != nil {
-			return err
-		}
-		config := &pointer.Config{
-			Mains:          mains,
-			BuildCallGraph: true,
-			Log:            ptalog,
-		}
-		ptares, err := pointer.Analyze(config)
-		if err != nil {
-			return err // internal error in pointer analysis
-		}
-		cg = ptares.CallGraph
+		return fmt.Errorf("pointer analysis is no longer supported (see Go issue #59676)")
 
 	case "rta":
 		mains, err := mainPackages(pkgs)

cmd/callgraph/main_test.go

@@ -65,14 +65,6 @@ func TestCallgraph(t *testing.T) {
 			"pkg.main --> pkg.main2",
 			"pkg.main2 --> (pkg.D).f",
 		}},
-		{"pta", false, []string{
-			// pta distinguishes main->C, main2->D.  Also has a root node.
-			`<root> --> pkg.init`,
-			`<root> --> pkg.main`,
-			`pkg.main --> (pkg.C).f`,
-			`pkg.main --> pkg.main2`,
-			`pkg.main2 --> (pkg.D).f`,
-		}},
 		// tests: both the package's main and the test's main are called.
 		// The callgraph includes all the guts of the "testing" package.
 		{"rta", true, []string{
@@ -87,14 +79,6 @@ func TestCallgraph(t *testing.T) {
 			`pkg.Example --> (pkg.C).f`,
 			`pkg.main --> (pkg.C).f`,
 		}},
-		{"pta", true, []string{
-			`<root> --> pkg.test.main`,
-			`<root> --> pkg.main`,
-			`pkg.test.main --> testing.MainStart`,
-			`testing.runExample --> pkg.Example`,
-			`pkg.Example --> (pkg.C).f`,
-			`pkg.main --> (pkg.C).f`,
-		}},
 	} {
 		const format = "{{.Caller}} --> {{.Callee}}"
 		stdout = new(bytes.Buffer)