diff options
| author | Keith Randall <khr@golang.org> | 2013-12-17 16:55:06 -0800 |
|---|---|---|
| committer | Keith Randall <khr@golang.org> | 2013-12-17 16:55:06 -0800 |
| commit | deb554934c0c2a87b24f4eb29cdcbbd4ea68a6d6 (patch) | |
| tree | 9a74875d203e53aa1fa9800ea7497a7e4e29b719 /src/cmd | |
| parent | bccf029fc09c4b993f6a638b16c5fe33f0102828 (diff) | |
| download | go-deb554934c0c2a87b24f4eb29cdcbbd4ea68a6d6.tar.xz | |
runtime, gc: call interface conversion routines by reference.
Part of getting rid of vararg C calls.
R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/23310043
Diffstat (limited to 'src/cmd')
| -rw-r--r-- | src/cmd/gc/builtin.c | 4 | ||||
| -rw-r--r-- | src/cmd/gc/runtime.go | 4 | ||||
| -rw-r--r-- | src/cmd/gc/walk.c | 15 |
3 files changed, 18 insertions, 5 deletions
diff --git a/src/cmd/gc/builtin.c b/src/cmd/gc/builtin.c index f88659ee00..1b0297d7ca 100644 --- a/src/cmd/gc/builtin.c +++ b/src/cmd/gc/builtin.c @@ -42,8 +42,8 @@ char *runtimeimport = "func @\"\".typ2Itab (@\"\".typ·2 *byte, @\"\".typ2·3 *byte, @\"\".cache·4 **byte) (@\"\".ret·1 *byte)\n" "func @\"\".convI2E (@\"\".elem·2 any) (@\"\".ret·1 any)\n" "func @\"\".convI2I (@\"\".typ·2 *byte, @\"\".elem·3 any) (@\"\".ret·1 any)\n" - "func @\"\".convT2E (@\"\".typ·2 *byte, @\"\".elem·3 any) (@\"\".ret·1 any)\n" - "func @\"\".convT2I (@\"\".typ·2 *byte, @\"\".typ2·3 *byte, @\"\".cache·4 **byte, @\"\".elem·5 any) (@\"\".ret·1 any)\n" + "func @\"\".convT2E (@\"\".typ·2 *byte, @\"\".elem·3 *any) (@\"\".ret·1 any)\n" + "func @\"\".convT2I (@\"\".typ·2 *byte, @\"\".typ2·3 *byte, @\"\".cache·4 **byte, @\"\".elem·5 *any) (@\"\".ret·1 any)\n" "func @\"\".assertE2E (@\"\".typ·2 *byte, @\"\".iface·3 any) (@\"\".ret·1 any)\n" "func @\"\".assertE2E2 (@\"\".typ·3 *byte, @\"\".iface·4 any) (@\"\".ret·1 any, @\"\".ok·2 bool)\n" "func @\"\".assertE2I (@\"\".typ·2 *byte, @\"\".iface·3 any) (@\"\".ret·1 any)\n" diff --git a/src/cmd/gc/runtime.go b/src/cmd/gc/runtime.go index 662eb8251f..852a545a91 100644 --- a/src/cmd/gc/runtime.go +++ b/src/cmd/gc/runtime.go @@ -58,8 +58,8 @@ func slicestringcopy(to any, fr any) int func typ2Itab(typ *byte, typ2 *byte, cache **byte) (ret *byte) func convI2E(elem any) (ret any) func convI2I(typ *byte, elem any) (ret any) -func convT2E(typ *byte, elem any) (ret any) -func convT2I(typ *byte, typ2 *byte, cache **byte, elem any) (ret any) +func convT2E(typ *byte, elem *any) (ret any) +func convT2I(typ *byte, typ2 *byte, cache **byte, elem *any) (ret any) // interface type assertions x.(T) func assertE2E(typ *byte, iface any) (ret any) diff --git a/src/cmd/gc/walk.c b/src/cmd/gc/walk.c index 590909f234..d28495d0b7 100644 --- a/src/cmd/gc/walk.c +++ b/src/cmd/gc/walk.c @@ -898,7 +898,20 @@ walkexpr(Node **np, NodeList **init) goto ret; } } - ll = list(ll, n->left); + if(isinter(n->left->type)) { + ll = list(ll, n->left); + } else { + // regular types are passed by reference to avoid C vararg calls + if(islvalue(n->left)) { + ll = list(ll, nod(OADDR, n->left, N)); + } else { + var = temp(n->left->type); + n1 = nod(OAS, var, n->left); + typecheck(&n1, Etop); + *init = list(*init, n1); + ll = list(ll, nod(OADDR, var, N)); + } + } argtype(fn, n->left->type); argtype(fn, n->type); dowidth(fn->type); |