From 034d5fcc30ff97350d16df65d403cfcc8ac5d22b Mon Sep 17 00:00:00 2001
From: Keith Randall <khr@golang.org>
Date: Mon, 5 Aug 2013 17:53:08 -0700
Subject: [PATCH] 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
---
 misc/cgo/test/callback.go | 1 -
 src/pkg/runtime/cgocall.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/misc/cgo/test/callback.go b/misc/cgo/test/callback.go
index 467edfbae54..838105155a5 100644
--- 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 91a55131e6a..a9daf809148 100644
--- 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);