runtime: fix TestVectoredHandlerExceptionInNonGoThread

This test is failing on the windows-arm64-10 builder
https://build.golang.org/log/c161c86be1af83c349ee02c1b12eff5828818f50.

It is not failing on windows-arm64-11, so I guess it has something to
do with the compiler.

This CL simplifies the test so is easier to build.

Change-Id: I6e0e1cf237277628f8ebf892c70ab54cd0077680
Reviewed-on: https://go-review.googlesource.com/c/go/+/444438
TryBot-Result: Gopher Robot <[email protected]>
Reviewed-by: Michael Pratt <[email protected]>
Run-TryBot: Quim Muntal <[email protected]>
Reviewed-by: Bryan Mills <[email protected]>

Author: qmuntal

src/runtime/signal_windows_test.go

@@ -23,14 +23,14 @@ func TestVectoredHandlerExceptionInNonGoThread(t *testing.T) {
 	}
 	testenv.MustHaveGoBuild(t)
 	testenv.MustHaveCGO(t)
-	testenv.MustHaveExecPath(t, "g++")
+	testenv.MustHaveExecPath(t, "gcc")
 	testprog.Lock()
 	defer testprog.Unlock()
 	dir := t.TempDir()
 
 	// build c program
 	dll := filepath.Join(dir, "veh.dll")
-	cmd := exec.Command("g++", "-shared", "-o", dll, "testdata/testwinlibthrow/veh.cpp", "-static", "-lstdc++")
+	cmd := exec.Command("gcc", "-shared", "-o", dll, "testdata/testwinlibthrow/veh.c")
 	out, err := testenv.CleanCmdEnv(cmd).CombinedOutput()
 	if err != nil {
 		t.Fatalf("failed to build c exe: %s\n%s", err, out)

src/runtime/testdata/testwinlibthrow/main.go

@@ -7,17 +7,13 @@ import (
 
 func main() {
 	dll := syscall.MustLoadDLL("veh.dll")
-	RaiseExcept := dll.MustFindProc("RaiseExcept")
 	RaiseNoExcept := dll.MustFindProc("RaiseNoExcept")
-	ThreadRaiseExcept := dll.MustFindProc("ThreadRaiseExcept")
 	ThreadRaiseNoExcept := dll.MustFindProc("ThreadRaiseNoExcept")
 
 	thread := len(os.Args) > 1 && os.Args[1] == "thread"
 	if !thread {
-		RaiseExcept.Call()
 		RaiseNoExcept.Call()
 	} else {
-		ThreadRaiseExcept.Call()
 		ThreadRaiseNoExcept.Call()
 	}
 }

src/runtime/testdata/testwinlibthrow/veh.c

@@ -0,0 +1,26 @@
+//go:build ignore
+
+#include <windows.h>
+
+__declspec(dllexport)
+void RaiseNoExcept(void)
+{
+    RaiseException(42, 0, 0, 0);
+}
+
+static DWORD WINAPI ThreadRaiser(void* Context)
+{
+    RaiseNoExcept();
+    return 0;
+}
+
+__declspec(dllexport)
+void ThreadRaiseNoExcept(void)
+{
+    HANDLE thread = CreateThread(0, 0, ThreadRaiser,  0, 0, 0);
+    if (0 != thread)
+    {
+        WaitForSingleObject(thread, INFINITE);
+        CloseHandle(thread);
+    }
+}