internal/gcimporter: add a missing return if objectpath fails

findleyr · findleyr · commit 3d20bbe0fb2f · 2023-07-31T15:47:30.000Z
The export data encoding was not symmetric in the case where objectpath fails. Fixes golang/go#61670 Change-Id: Ifaaa8eaed7ee5e28aa3b5ee7e9600b9e379e1968 Reviewed-on: https://go-review.googlesource.com/c/tools/+/514355 gopls-CI: kokoro <noreply+kokoro@google.com> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com> Run-TryBot: Robert Findley <rfindley@google.com>
diff --git a/internal/gcimporter/iexport.go b/internal/gcimporter/iexport.go
@@ -929,10 +929,11 @@ func (w *exportWriter) objectPath(obj types.Object) {
 		// that export/import is producing a correct package.
 		//
 		// TODO: remove reportf once we have such confidence.
-		objectPath = ""
+		w.string("")
 		if w.p.reportf != nil {
 			w.p.reportf("unable to encode object %q in package %q: %v", obj.Name(), obj.Pkg().Path(), err)
 		}
+		return
 	}
 	w.string(string(objectPath))
 	w.pkg(obj.Pkg())

Original file line number	Diff line number	Diff line change
`@@ -929,10 +929,11 @@ func (w *exportWriter) objectPath(obj types.Object) {`
`929`	`929`	`// that export/import is producing a correct package.`
`930`	`930`	`//`
`931`	`931`	`// TODO: remove reportf once we have such confidence.`
`932`		`- objectPath = ""`
	`932`	`+ w.string("")`
`933`	`933`	`if w.p.reportf != nil {`
`934`	`934`	`w.p.reportf("unable to encode object %q in package %q: %v", obj.Name(), obj.Pkg().Path(), err)`
`935`	`935`	`}`
	`936`	`+ return`
`936`	`937`	`}`
`937`	`938`	`w.string(string(objectPath))`
`938`	`939`	`w.pkg(obj.Pkg())`