Skip to content

Commit 034d5fc

Browse files
committed
runtime: Use old reflect.call implementation from cgo.
Basically a partial rollback of 12053043 until I can figure out what is really going on. Fixes bug 6051. R=golang-dev CC=golang-dev https://golang.org/cl/12496043
1 parent b1c4531 commit 034d5fc

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

misc/cgo/test/callback.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ func testCallbackCallers(t *testing.T) {
151151
n := 0
152152
name := []string{
153153
"test.goCallback",
154-
"runtime.call16",
155154
"runtime.cgocallbackg1",
156155
"runtime.cgocallbackg",
157156
"runtime.cgocallback_gofunc",

src/pkg/runtime/cgocall.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ runtime·cgocallbackg1(void)
295295

296296
// Invoke callback.
297297
cb = CBARGS;
298-
reflect·call(cb->fn, cb->arg, cb->argsize);
298+
runtime·newstackcall(cb->fn, cb->arg, cb->argsize);
299299

300300
if(raceenabled && !m->racecall)
301301
runtime·racereleasemerge(&cgosync);

0 commit comments

Comments
 (0)