xref: /aosp_15_r20/external/toolchain-utils/go/patch/go-1.10.2/go5.patch (revision 760c253c1ed00ce9abd48f8546f08516e57485fe)

runtime: deadlock detection does not work when using external linker.

--- src/runtime/crash_test.go
+++ src/runtime/crash_test.go
@@ -214,32 +214,37 @@ func testDeadlock(t *testing.T, name string) {
 	output := runTestProg(t, "testprog", name)
 	want := "fatal error: all goroutines are asleep - deadlock!\n"
 	if !strings.HasPrefix(output, want) {
 		t.Fatalf("output does not start with %q:\n%s", want, output)
 	}
 }

 func TestSimpleDeadlock(t *testing.T) {
+	t.Skip("deadlock detection fails with external linker")
 	testDeadlock(t, "SimpleDeadlock")
 }

 func TestInitDeadlock(t *testing.T) {
+	t.Skip("deadlock detection fails with external linker")
 	testDeadlock(t, "InitDeadlock")
 }

 func TestLockedDeadlock(t *testing.T) {
+	t.Skip("deadlock detection fails with external linker")
 	testDeadlock(t, "LockedDeadlock")
 }

 func TestLockedDeadlock2(t *testing.T) {
+	t.Skip("deadlock detection fails with external linker")
 	testDeadlock(t, "LockedDeadlock2")
 }

 func TestGoexitDeadlock(t *testing.T) {
+	t.Skip("deadlock detection fails with external linker")
 	output := runTestProg(t, "testprog", "GoexitDeadlock")
 	want := "no goroutines (main called runtime.Goexit) - deadlock!"
 	if !strings.Contains(output, want) {
 		t.Fatalf("output:\n%s\n\nwant output containing: %s", output, want)
 	}
 }

 func TestStackOverflow(t *testing.T) {
@@ -266,16 +271,17 @@ panic: again
 `
 	if !strings.HasPrefix(output, want) {
 		t.Fatalf("output does not start with %q:\n%s", want, output)
 	}

 }

 func TestGoexitCrash(t *testing.T) {
+	t.Skip("deadlock detection fails with external linker")
 	output := runTestProg(t, "testprog", "GoexitExit")
 	want := "no goroutines (main called runtime.Goexit) - deadlock!"
 	if !strings.Contains(output, want) {
 		t.Fatalf("output:\n%s\n\nwant output containing: %s", output, want)
 	}
 }

 func TestGoexitDefer(t *testing.T) {
@@ -324,16 +330,17 @@ func TestBreakpoint(t *testing.T) {
 	// "runtime.Breakpoint(...)" instead of "runtime.Breakpoint()".
 	want := "runtime.Breakpoint("
 	if !strings.Contains(output, want) {
 		t.Fatalf("output:\n%s\n\nwant output containing: %s", output, want)
 	}
 }

 func TestGoexitInPanic(t *testing.T) {
+	t.Skip("deadlock detection fails with external linker")
 	// see issue 8774: this code used to trigger an infinite recursion
 	output := runTestProg(t, "testprog", "GoexitInPanic")
 	want := "fatal error: no goroutines (main called runtime.Goexit) - deadlock!"
 	if !strings.HasPrefix(output, want) {
 		t.Fatalf("output does not start with %q:\n%s", want, output)
 	}
 }

@@ -388,16 +395,17 @@ func TestPanicAfterGoexit(t *testing.T) {
 	output := runTestProg(t, "testprog", "PanicAfterGoexit")
 	want := "panic: hello"
 	if !strings.HasPrefix(output, want) {
 		t.Fatalf("output does not start with %q:\n%s", want, output)
 	}
 }

 func TestRecoveredPanicAfterGoexit(t *testing.T) {
+	t.Skip("deadlock detection fails with external linker")
 	output := runTestProg(t, "testprog", "RecoveredPanicAfterGoexit")
 	want := "fatal error: no goroutines (main called runtime.Goexit) - deadlock!"
 	if !strings.HasPrefix(output, want) {
 		t.Fatalf("output does not start with %q:\n%s", want, output)
 	}
 }

 func TestRecoverBeforePanicAfterGoexit(t *testing.T) {
--- src/runtime/proc_test.go
+++ src/runtime/proc_test.go
@@ -349,19 +349,20 @@ func TestGCFairness2(t *testing.T) {
 	want := "OK\n"
 	if output != want {
 		t.Fatalf("want %s, got %s\n", want, output)
 	}
 }

 func TestNumGoroutine(t *testing.T) {
 	output := runTestProg(t, "testprog", "NumGoroutine")
-	want := "1\n"
-	if output != want {
-		t.Fatalf("want %q, got %q", want, output)
+	want1 := "1\n"
+	want2 := "2\n"
+	if output != want1 && output != want2 {
+		t.Fatalf("want %q, got %q", want1, output)
 	}

 	buf := make([]byte, 1<<20)

 	// Try up to 10 times for a match before giving up.
 	// This is a fundamentally racy check but it's important
 	// to notice if NumGoroutine and Stack are _always_ out of sync.
 	for i := 0; ; i++ {
--- test/fixedbugs/bug429_run.go
+++ test/fixedbugs/bug429_run.go
@@ -1,10 +1,10 @@
 // +build !nacl
-// runtarget
+// skip

 // Copyright 2014 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

 // Run the bug429.go test.

 package main
--- test/goprint.go
+++ test/goprint.go
@@ -3,19 +3,14 @@
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

 // Test that println can be the target of a go statement.

 package main

-import (
-	"runtime"
-	"time"
-)
+import "time"

 func main() {
 	go println(42, true, false, true, 1.5, "world", (chan int)(nil), []int(nil), (map[string]int)(nil), (func())(nil), byte(255))
-	for runtime.NumGoroutine() > 1 {
-		time.Sleep(10*time.Millisecond)
-	}
+	time.Sleep(100*time.Millisecond)
 }