Include objdump failures in test output.

We log a warning if objdump fails, but this appears in the build log, not test
log, which can make it hard to notice.

Include it with the actual escape output as context on "(possible)" to make it
more clear when something is wrong.

PiperOrigin-RevId: 350355759

1 files changed, 5 insertions, 5 deletions

diff --git a/tools/checkescape/checkescape.go b/tools/checkescape/checkescape.go
index a2c7c884f..011b8fee8 100644
--- a/tools/checkescape/checkescape.go
+++ b/tools/checkescape/checkescape.go
@@ -618,12 +618,12 @@ func findReasons(pass *analysis.Pass, fdecl *ast.FuncDecl) ([]EscapeReason, bool
 
 // run performs the analysis.
 func run(pass *analysis.Pass, localEscapes bool) (interface{}, error) {
-	calls, err := loadObjdump()
-	if err != nil {
+	calls, callsErr := loadObjdump()
+	if callsErr != nil {
 		// Note that if this analysis fails, then we don't actually
 		// fail the analyzer itself. We simply report every possible
 		// escape. In most cases this will work just fine.
-		log.Printf("WARNING: unable to load objdump: %v", err)
+		log.Printf("WARNING: unable to load objdump: %v", callsErr)
 	}
 	allEscapes := make(map[string][]Escapes)
 	mergedEscapes := make(map[string]Escapes)
@@ -645,10 +645,10 @@ func run(pass *analysis.Pass, localEscapes bool) (interface{}, error) {
 	}
 	hasCall := func(inst poser) (string, bool) {
 		p := linePosition(inst, nil)
-		if calls == nil {
+		if callsErr != nil {
 			// See above: we don't have access to the binary
 			// itself, so need to include every possible call.
-			return "(possible)", true
+			return fmt.Sprintf("(possible, unable to load objdump: %v)", callsErr), true
 		}
 		s, ok := calls[p.Simplified()]
 		if !ok {