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

diff --git a/misc/cgo/test/callback.go b/misc/cgo/test/callback.go
index 467edfbae546da3cb83f763e2ee755ccb9e490da..838105155a59772ea53f29c256cf0ad350be0ae9 100644 (file)
--- a/misc/cgo/test/callback.go
+++ b/misc/cgo/test/callback.go
@@ -151,7 +151,6 @@ func testCallbackCallers(t *testing.T) {
        n := 0
        name := []string{
                "test.goCallback",
-               "runtime.call16",
                "runtime.cgocallbackg1",
                "runtime.cgocallbackg",
                "runtime.cgocallback_gofunc",

diff --git a/src/pkg/runtime/cgocall.c b/src/pkg/runtime/cgocall.c
index 91a55131e6aa47a61648ac8d3e374ccc153f0522..a9daf80914845ee07b34c6f3f319ffee2b4043c9 100644 (file)
--- a/src/pkg/runtime/cgocall.c
+++ b/src/pkg/runtime/cgocall.c
@@ -295,7 +295,7 @@ runtime·cgocallbackg1(void)
 
        // Invoke callback.
        cb = CBARGS;
-       reflect·call(cb->fn, cb->arg, cb->argsize);
+       runtime·newstackcall(cb->fn, cb->arg, cb->argsize);
 
        if(raceenabled && !m->racecall)
                runtime·racereleasemerge(&cgosync);