cmd/compile: make panicwrap argument-free

When code defines a method on T,
the compiler generates a corresponding wrapper method on *T.
The first thing the wrapper does is check whether
the pointer is nil and if so, call panicwrap.
This is done to provide a useful error message.

The existing implementation gets its information
from arguments set up by the compiler.
However, with some trouble, this information can
be extracted from the name of the wrapper method itself.

Removing the arguments to panicwrap simplifies and
shrinks the wrapper method.
It also means that the call to panicwrap does not
require any stack space.
This enables a further optimization on amd64/x86,
which is to skip the function prologue if nothing
else in the method requires stack space.
This is frequently the case in simple, hot methods,
such as Less and Swap in sort.Interface implementations.

Fixes #19040.

Benchmarks for package sort on amd64:

name                  old time/op  new time/op  delta
SearchWrappers-8       104ns ± 1%   104ns ± 1%    ~     (p=0.286 n=27+27)
SortString1K-8         128µs ± 1%   128µs ± 1%  -0.44%  (p=0.004 n=30+30)
SortString1K_Slice-8   118µs ± 2%   117µs ± 1%    ~     (p=0.106 n=30+30)
StableString1K-8      18.6µs ± 1%  18.6µs ± 1%    ~     (p=0.446 n=28+26)
SortInt1K-8           65.9µs ± 1%  60.7µs ± 1%  -7.96%  (p=0.000 n=28+30)
StableInt1K-8         75.3µs ± 2%  72.8µs ± 1%  -3.41%  (p=0.000 n=30+30)
StableInt1K_Slice-8   57.7µs ± 1%  57.7µs ± 1%    ~     (p=0.515 n=30+30)
SortInt64K-8          6.28ms ± 1%  6.01ms ± 1%  -4.19%  (p=0.000 n=28+28)
SortInt64K_Slice-8    5.04ms ± 1%  5.04ms ± 1%    ~     (p=0.927 n=28+27)
StableInt64K-8        6.65ms ± 1%  6.38ms ± 1%  -3.97%  (p=0.000 n=26+30)
Sort1e2-8             37.9µs ± 1%  37.2µs ± 1%  -1.89%  (p=0.000 n=29+27)
Stable1e2-8           77.0µs ± 1%  74.7µs ± 1%  -3.06%  (p=0.000 n=27+30)
Sort1e4-8             8.21ms ± 2%  7.98ms ± 1%  -2.77%  (p=0.000 n=29+30)
Stable1e4-8           24.8ms ± 1%  24.3ms ± 1%  -2.31%  (p=0.000 n=28+30)
Sort1e6-8              1.27s ± 4%   1.22s ± 1%  -3.42%  (p=0.000 n=30+29)
Stable1e6-8            5.06s ± 1%   4.92s ± 1%  -2.77%  (p=0.000 n=25+29)
[Geo mean]             731µs        714µs       -2.29%

Before/after assembly for sort.(*intPairs).Less follows.
It can be optimized further, but that's for a follow-up CL.

Before:

"".(*intPairs).Less t=1 size=214 args=0x20 locals=0x38
	0x0000 00000 (<autogenerated>:1)	TEXT	"".(*intPairs).Less(SB), $56-32
	0x0000 00000 (<autogenerated>:1)	MOVQ	(TLS), CX
	0x0009 00009 (<autogenerated>:1)	CMPQ	SP, 16(CX)
	0x000d 00013 (<autogenerated>:1)	JLS	204
	0x0013 00019 (<autogenerated>:1)	SUBQ	$56, SP
	0x0017 00023 (<autogenerated>:1)	MOVQ	BP, 48(SP)
	0x001c 00028 (<autogenerated>:1)	LEAQ	48(SP), BP
	0x0021 00033 (<autogenerated>:1)	MOVQ	32(CX), BX
	0x0025 00037 (<autogenerated>:1)	TESTQ	BX, BX
	0x0028 00040 (<autogenerated>:1)	JEQ	55
	0x002a 00042 (<autogenerated>:1)	LEAQ	64(SP), DI
	0x002f 00047 (<autogenerated>:1)	CMPQ	(BX), DI
	0x0032 00050 (<autogenerated>:1)	JNE	55
	0x0034 00052 (<autogenerated>:1)	MOVQ	SP, (BX)
	0x0037 00055 (<autogenerated>:1)	NOP
	0x0037 00055 (<autogenerated>:1)	FUNCDATA	$0, gclocals·4032f753396f2012ad1784f398b170f4(SB)
	0x0037 00055 (<autogenerated>:1)	FUNCDATA	$1, gclocals·69c1753bd5f81501d95132d08af04464(SB)
	0x0037 00055 (<autogenerated>:1)	MOVQ	""..this+64(FP), AX
	0x003c 00060 (<autogenerated>:1)	TESTQ	AX, AX
	0x003f 00063 (<autogenerated>:1)	JEQ	$0, 135
	0x0041 00065 (<autogenerated>:1)	MOVQ	(AX), CX
	0x0044 00068 (<autogenerated>:1)	MOVQ	8(AX), AX
	0x0048 00072 (<autogenerated>:1)	MOVQ	"".i+72(FP), DX
	0x004d 00077 (<autogenerated>:1)	CMPQ	DX, AX
	0x0050 00080 (<autogenerated>:1)	JCC	$0, 128
	0x0052 00082 (<autogenerated>:1)	SHLQ	$4, DX
	0x0056 00086 (<autogenerated>:1)	MOVQ	(CX)(DX*1), DX
	0x005a 00090 (<autogenerated>:1)	MOVQ	"".j+80(FP), BX
	0x005f 00095 (<autogenerated>:1)	CMPQ	BX, AX
	0x0062 00098 (<autogenerated>:1)	JCC	$0, 128
	0x0064 00100 (<autogenerated>:1)	SHLQ	$4, BX
	0x0068 00104 (<autogenerated>:1)	MOVQ	(CX)(BX*1), AX
	0x006c 00108 (<autogenerated>:1)	CMPQ	DX, AX
	0x006f 00111 (<autogenerated>:1)	SETLT	AL
	0x0072 00114 (<autogenerated>:1)	MOVB	AL, "".~r2+88(FP)
	0x0076 00118 (<autogenerated>:1)	MOVQ	48(SP), BP
	0x007b 00123 (<autogenerated>:1)	ADDQ	$56, SP
	0x007f 00127 (<autogenerated>:1)	RET
	0x0080 00128 (<autogenerated>:1)	PCDATA	$0, $1
	0x0080 00128 (<autogenerated>:1)	CALL	runtime.panicindex(SB)
	0x0085 00133 (<autogenerated>:1)	UNDEF
	0x0087 00135 (<autogenerated>:1)	LEAQ	go.string."sort_test"(SB), AX
	0x008e 00142 (<autogenerated>:1)	MOVQ	AX, (SP)
	0x0092 00146 (<autogenerated>:1)	MOVQ	$9, 8(SP)
	0x009b 00155 (<autogenerated>:1)	LEAQ	go.string."intPairs"(SB), AX
	0x00a2 00162 (<autogenerated>:1)	MOVQ	AX, 16(SP)
	0x00a7 00167 (<autogenerated>:1)	MOVQ	$8, 24(SP)
	0x00b0 00176 (<autogenerated>:1)	LEAQ	go.string."Less"(SB), AX
	0x00b7 00183 (<autogenerated>:1)	MOVQ	AX, 32(SP)
	0x00bc 00188 (<autogenerated>:1)	MOVQ	$4, 40(SP)
	0x00c5 00197 (<autogenerated>:1)	PCDATA	$0, $1
	0x00c5 00197 (<autogenerated>:1)	CALL	runtime.panicwrap(SB)
	0x00ca 00202 (<autogenerated>:1)	UNDEF
	0x00cc 00204 (<autogenerated>:1)	NOP
	0x00cc 00204 (<autogenerated>:1)	PCDATA	$0, $-1
	0x00cc 00204 (<autogenerated>:1)	CALL	runtime.morestack_noctxt(SB)
	0x00d1 00209 (<autogenerated>:1)	JMP	0

After:

"".(*intPairs).Swap t=1 size=147 args=0x18 locals=0x8
	0x0000 00000 (<autogenerated>:1)	TEXT	"".(*intPairs).Swap(SB), $8-24
	0x0000 00000 (<autogenerated>:1)	MOVQ	(TLS), CX
	0x0009 00009 (<autogenerated>:1)	SUBQ	$8, SP
	0x000d 00013 (<autogenerated>:1)	MOVQ	BP, (SP)
	0x0011 00017 (<autogenerated>:1)	LEAQ	(SP), BP
	0x0015 00021 (<autogenerated>:1)	MOVQ	32(CX), BX
	0x0019 00025 (<autogenerated>:1)	TESTQ	BX, BX
	0x001c 00028 (<autogenerated>:1)	JEQ	43
	0x001e 00030 (<autogenerated>:1)	LEAQ	16(SP), DI
	0x0023 00035 (<autogenerated>:1)	CMPQ	(BX), DI
	0x0026 00038 (<autogenerated>:1)	JNE	43
	0x0028 00040 (<autogenerated>:1)	MOVQ	SP, (BX)
	0x002b 00043 (<autogenerated>:1)	NOP
	0x002b 00043 (<autogenerated>:1)	FUNCDATA	$0, gclocals·e6397a44f8e1b6e77d0f200b4fba5269(SB)
	0x002b 00043 (<autogenerated>:1)	FUNCDATA	$1, gclocals·69c1753bd5f81501d95132d08af04464(SB)
	0x002b 00043 (<autogenerated>:1)	MOVQ	""..this+16(FP), AX
	0x0030 00048 (<autogenerated>:1)	TESTQ	AX, AX
	0x0033 00051 (<autogenerated>:1)	JEQ	$0, 140
	0x0035 00053 (<autogenerated>:1)	MOVQ	(AX), CX
	0x0038 00056 (<autogenerated>:1)	MOVQ	8(AX), AX
	0x003c 00060 (<autogenerated>:1)	MOVQ	"".i+24(FP), DX
	0x0041 00065 (<autogenerated>:1)	CMPQ	DX, AX
	0x0044 00068 (<autogenerated>:1)	JCC	$0, 133
	0x0046 00070 (<autogenerated>:1)	SHLQ	$4, DX
	0x004a 00074 (<autogenerated>:1)	MOVQ	8(CX)(DX*1), BX
	0x004f 00079 (<autogenerated>:1)	MOVQ	(CX)(DX*1), SI
	0x0053 00083 (<autogenerated>:1)	MOVQ	"".j+32(FP), DI
	0x0058 00088 (<autogenerated>:1)	CMPQ	DI, AX
	0x005b 00091 (<autogenerated>:1)	JCC	$0, 133
	0x005d 00093 (<autogenerated>:1)	SHLQ	$4, DI
	0x0061 00097 (<autogenerated>:1)	MOVQ	8(CX)(DI*1), AX
	0x0066 00102 (<autogenerated>:1)	MOVQ	(CX)(DI*1), R8
	0x006a 00106 (<autogenerated>:1)	MOVQ	R8, (CX)(DX*1)
	0x006e 00110 (<autogenerated>:1)	MOVQ	AX, 8(CX)(DX*1)
	0x0073 00115 (<autogenerated>:1)	MOVQ	SI, (CX)(DI*1)
	0x0077 00119 (<autogenerated>:1)	MOVQ	BX, 8(CX)(DI*1)
	0x007c 00124 (<autogenerated>:1)	MOVQ	(SP), BP
	0x0080 00128 (<autogenerated>:1)	ADDQ	$8, SP
	0x0084 00132 (<autogenerated>:1)	RET
	0x0085 00133 (<autogenerated>:1)	PCDATA	$0, $1
	0x0085 00133 (<autogenerated>:1)	CALL	runtime.panicindex(SB)
	0x008a 00138 (<autogenerated>:1)	UNDEF
	0x008c 00140 (<autogenerated>:1)	PCDATA	$0, $1
	0x008c 00140 (<autogenerated>:1)	CALL	runtime.panicwrap(SB)
	0x0091 00145 (<autogenerated>:1)	UNDEF

Change-Id: I15bb8435f0690badb868799f313ed8817335efd3
Reviewed-on: https://go-review.googlesource.com/36809
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/cmd/compile/internal/gc/builtin.go b/src/cmd/compile/internal/gc/builtin.go
index 71b323f8a1d1b2796b079578e3b05346d1a6e6dc..70200c624b4bafe81e88eb70e813ea00d5ba035a 100644 (file)
--- a/src/cmd/compile/internal/gc/builtin.go
+++ b/src/cmd/compile/internal/gc/builtin.go
@@ -12,229 +12,228 @@ var runtimeDecls = [...]struct {
        {"panicslice", funcTag, 5},
        {"panicdivide", funcTag, 5},
        {"throwinit", funcTag, 5},
-       {"panicwrap", funcTag, 7},
-       {"gopanic", funcTag, 9},
-       {"gorecover", funcTag, 12},
+       {"panicwrap", funcTag, 5},
+       {"gopanic", funcTag, 7},
+       {"gorecover", funcTag, 10},
        {"goschedguarded", funcTag, 5},
-       {"printbool", funcTag, 14},
-       {"printfloat", funcTag, 16},
-       {"printint", funcTag, 18},
-       {"printhex", funcTag, 20},
-       {"printuint", funcTag, 20},
-       {"printcomplex", funcTag, 22},
-       {"printstring", funcTag, 23},
-       {"printpointer", funcTag, 24},
-       {"printiface", funcTag, 24},
-       {"printeface", funcTag, 24},
-       {"printslice", funcTag, 24},
+       {"printbool", funcTag, 12},
+       {"printfloat", funcTag, 14},
+       {"printint", funcTag, 16},
+       {"printhex", funcTag, 18},
+       {"printuint", funcTag, 18},
+       {"printcomplex", funcTag, 20},
+       {"printstring", funcTag, 22},
+       {"printpointer", funcTag, 23},
+       {"printiface", funcTag, 23},
+       {"printeface", funcTag, 23},
+       {"printslice", funcTag, 23},
        {"printnl", funcTag, 5},
        {"printsp", funcTag, 5},
        {"printlock", funcTag, 5},
        {"printunlock", funcTag, 5},
-       {"concatstring2", funcTag, 27},
-       {"concatstring3", funcTag, 28},
-       {"concatstring4", funcTag, 29},
-       {"concatstring5", funcTag, 30},
-       {"concatstrings", funcTag, 32},
-       {"cmpstring", funcTag, 34},
-       {"eqstring", funcTag, 35},
-       {"intstring", funcTag, 38},
-       {"slicebytetostring", funcTag, 40},
-       {"slicebytetostringtmp", funcTag, 41},
-       {"slicerunetostring", funcTag, 44},
-       {"stringtoslicebyte", funcTag, 45},
-       {"stringtoslicerune", funcTag, 48},
-       {"decoderune", funcTag, 49},
-       {"slicecopy", funcTag, 51},
-       {"slicestringcopy", funcTag, 52},
-       {"convI2I", funcTag, 53},
-       {"convT2E", funcTag, 54},
-       {"convT2I", funcTag, 54},
-       {"assertE2I", funcTag, 53},
-       {"assertE2I2", funcTag, 55},
-       {"assertI2I", funcTag, 53},
-       {"assertI2I2", funcTag, 55},
-       {"panicdottype", funcTag, 56},
-       {"panicnildottype", funcTag, 57},
-       {"ifaceeq", funcTag, 58},
-       {"efaceeq", funcTag, 58},
-       {"makemap", funcTag, 60},
-       {"mapaccess1", funcTag, 61},
-       {"mapaccess1_fast32", funcTag, 62},
-       {"mapaccess1_fast64", funcTag, 62},
-       {"mapaccess1_faststr", funcTag, 62},
-       {"mapaccess1_fat", funcTag, 63},
-       {"mapaccess2", funcTag, 64},
-       {"mapaccess2_fast32", funcTag, 65},
-       {"mapaccess2_fast64", funcTag, 65},
-       {"mapaccess2_faststr", funcTag, 65},
-       {"mapaccess2_fat", funcTag, 66},
-       {"mapassign", funcTag, 61},
-       {"mapiterinit", funcTag, 67},
-       {"mapdelete", funcTag, 67},
-       {"mapiternext", funcTag, 68},
-       {"makechan", funcTag, 70},
-       {"chanrecv1", funcTag, 72},
-       {"chanrecv2", funcTag, 73},
-       {"chansend1", funcTag, 75},
-       {"closechan", funcTag, 24},
-       {"writeBarrier", varTag, 76},
-       {"writebarrierptr", funcTag, 77},
-       {"typedmemmove", funcTag, 78},
-       {"typedmemclr", funcTag, 79},
-       {"typedslicecopy", funcTag, 80},
-       {"selectnbsend", funcTag, 81},
-       {"selectnbrecv", funcTag, 82},
-       {"selectnbrecv2", funcTag, 84},
-       {"newselect", funcTag, 85},
-       {"selectsend", funcTag, 81},
-       {"selectrecv", funcTag, 73},
-       {"selectrecv2", funcTag, 86},
-       {"selectdefault", funcTag, 87},
-       {"selectgo", funcTag, 57},
+       {"concatstring2", funcTag, 26},
+       {"concatstring3", funcTag, 27},
+       {"concatstring4", funcTag, 28},
+       {"concatstring5", funcTag, 29},
+       {"concatstrings", funcTag, 31},
+       {"cmpstring", funcTag, 33},
+       {"eqstring", funcTag, 34},
+       {"intstring", funcTag, 37},
+       {"slicebytetostring", funcTag, 39},
+       {"slicebytetostringtmp", funcTag, 40},
+       {"slicerunetostring", funcTag, 43},
+       {"stringtoslicebyte", funcTag, 44},
+       {"stringtoslicerune", funcTag, 47},
+       {"decoderune", funcTag, 48},
+       {"slicecopy", funcTag, 50},
+       {"slicestringcopy", funcTag, 51},
+       {"convI2I", funcTag, 52},
+       {"convT2E", funcTag, 53},
+       {"convT2I", funcTag, 53},
+       {"assertE2I", funcTag, 52},
+       {"assertE2I2", funcTag, 54},
+       {"assertI2I", funcTag, 52},
+       {"assertI2I2", funcTag, 54},
+       {"panicdottype", funcTag, 55},
+       {"panicnildottype", funcTag, 56},
+       {"ifaceeq", funcTag, 57},
+       {"efaceeq", funcTag, 57},
+       {"makemap", funcTag, 59},
+       {"mapaccess1", funcTag, 60},
+       {"mapaccess1_fast32", funcTag, 61},
+       {"mapaccess1_fast64", funcTag, 61},
+       {"mapaccess1_faststr", funcTag, 61},
+       {"mapaccess1_fat", funcTag, 62},
+       {"mapaccess2", funcTag, 63},
+       {"mapaccess2_fast32", funcTag, 64},
+       {"mapaccess2_fast64", funcTag, 64},
+       {"mapaccess2_faststr", funcTag, 64},
+       {"mapaccess2_fat", funcTag, 65},
+       {"mapassign", funcTag, 60},
+       {"mapiterinit", funcTag, 66},
+       {"mapdelete", funcTag, 66},
+       {"mapiternext", funcTag, 67},
+       {"makechan", funcTag, 69},
+       {"chanrecv1", funcTag, 71},
+       {"chanrecv2", funcTag, 72},
+       {"chansend1", funcTag, 74},
+       {"closechan", funcTag, 23},
+       {"writeBarrier", varTag, 75},
+       {"writebarrierptr", funcTag, 76},
+       {"typedmemmove", funcTag, 77},
+       {"typedmemclr", funcTag, 78},
+       {"typedslicecopy", funcTag, 79},
+       {"selectnbsend", funcTag, 80},
+       {"selectnbrecv", funcTag, 81},
+       {"selectnbrecv2", funcTag, 83},
+       {"newselect", funcTag, 84},
+       {"selectsend", funcTag, 80},
+       {"selectrecv", funcTag, 72},
+       {"selectrecv2", funcTag, 85},
+       {"selectdefault", funcTag, 86},
+       {"selectgo", funcTag, 56},
        {"block", funcTag, 5},
-       {"makeslice", funcTag, 89},
-       {"makeslice64", funcTag, 90},
-       {"growslice", funcTag, 91},
-       {"memmove", funcTag, 92},
-       {"memclrNoHeapPointers", funcTag, 93},
-       {"memclrHasPointers", funcTag, 93},
-       {"memequal", funcTag, 94},
-       {"memequal8", funcTag, 95},
-       {"memequal16", funcTag, 95},
-       {"memequal32", funcTag, 95},
-       {"memequal64", funcTag, 95},
-       {"memequal128", funcTag, 95},
-       {"int64div", funcTag, 96},
-       {"uint64div", funcTag, 97},
-       {"int64mod", funcTag, 96},
-       {"uint64mod", funcTag, 97},
-       {"float64toint64", funcTag, 98},
-       {"float64touint64", funcTag, 99},
-       {"float64touint32", funcTag, 101},
-       {"int64tofloat64", funcTag, 102},
-       {"uint64tofloat64", funcTag, 103},
-       {"uint32tofloat64", funcTag, 104},
-       {"complex128div", funcTag, 105},
-       {"racefuncenter", funcTag, 106},
+       {"makeslice", funcTag, 88},
+       {"makeslice64", funcTag, 89},
+       {"growslice", funcTag, 90},
+       {"memmove", funcTag, 91},
+       {"memclrNoHeapPointers", funcTag, 92},
+       {"memclrHasPointers", funcTag, 92},
+       {"memequal", funcTag, 93},
+       {"memequal8", funcTag, 94},
+       {"memequal16", funcTag, 94},
+       {"memequal32", funcTag, 94},
+       {"memequal64", funcTag, 94},
+       {"memequal128", funcTag, 94},
+       {"int64div", funcTag, 95},
+       {"uint64div", funcTag, 96},
+       {"int64mod", funcTag, 95},
+       {"uint64mod", funcTag, 96},
+       {"float64toint64", funcTag, 97},
+       {"float64touint64", funcTag, 98},
+       {"float64touint32", funcTag, 100},
+       {"int64tofloat64", funcTag, 101},
+       {"uint64tofloat64", funcTag, 102},
+       {"uint32tofloat64", funcTag, 103},
+       {"complex128div", funcTag, 104},
+       {"racefuncenter", funcTag, 105},
        {"racefuncexit", funcTag, 5},
-       {"raceread", funcTag, 106},
-       {"racewrite", funcTag, 106},
-       {"racereadrange", funcTag, 107},
-       {"racewriterange", funcTag, 107},
-       {"msanread", funcTag, 107},
-       {"msanwrite", funcTag, 107},
+       {"raceread", funcTag, 105},
+       {"racewrite", funcTag, 105},
+       {"racereadrange", funcTag, 106},
+       {"racewriterange", funcTag, 106},
+       {"msanread", funcTag, 106},
+       {"msanwrite", funcTag, 106},
 }
 
 func runtimeTypes() []*Type {
-       var typs [108]*Type
+       var typs [107]*Type
        typs[0] = bytetype
        typs[1] = typPtr(typs[0])
        typs[2] = Types[TANY]
        typs[3] = typPtr(typs[2])
        typs[4] = functype(nil, []*Node{anonfield(typs[1])}, []*Node{anonfield(typs[3])})
        typs[5] = functype(nil, nil, nil)
-       typs[6] = Types[TSTRING]
-       typs[7] = functype(nil, []*Node{anonfield(typs[6]), anonfield(typs[6]), anonfield(typs[6])}, nil)
-       typs[8] = Types[TINTER]
-       typs[9] = functype(nil, []*Node{anonfield(typs[8])}, nil)
-       typs[10] = Types[TINT32]
-       typs[11] = typPtr(typs[10])
-       typs[12] = functype(nil, []*Node{anonfield(typs[11])}, []*Node{anonfield(typs[8])})
-       typs[13] = Types[TBOOL]
+       typs[6] = Types[TINTER]
+       typs[7] = functype(nil, []*Node{anonfield(typs[6])}, nil)
+       typs[8] = Types[TINT32]
+       typs[9] = typPtr(typs[8])
+       typs[10] = functype(nil, []*Node{anonfield(typs[9])}, []*Node{anonfield(typs[6])})
+       typs[11] = Types[TBOOL]
+       typs[12] = functype(nil, []*Node{anonfield(typs[11])}, nil)
+       typs[13] = Types[TFLOAT64]
        typs[14] = functype(nil, []*Node{anonfield(typs[13])}, nil)
-       typs[15] = Types[TFLOAT64]
+       typs[15] = Types[TINT64]
        typs[16] = functype(nil, []*Node{anonfield(typs[15])}, nil)
-       typs[17] = Types[TINT64]
+       typs[17] = Types[TUINT64]
        typs[18] = functype(nil, []*Node{anonfield(typs[17])}, nil)
-       typs[19] = Types[TUINT64]
+       typs[19] = Types[TCOMPLEX128]
        typs[20] = functype(nil, []*Node{anonfield(typs[19])}, nil)
-       typs[21] = Types[TCOMPLEX128]
+       typs[21] = Types[TSTRING]
        typs[22] = functype(nil, []*Node{anonfield(typs[21])}, nil)
-       typs[23] = functype(nil, []*Node{anonfield(typs[6])}, nil)
-       typs[24] = functype(nil, []*Node{anonfield(typs[2])}, nil)
-       typs[25] = typArray(typs[0], 32)
-       typs[26] = typPtr(typs[25])
-       typs[27] = functype(nil, []*Node{anonfield(typs[26]), anonfield(typs[6]), anonfield(typs[6])}, []*Node{anonfield(typs[6])})
-       typs[28] = functype(nil, []*Node{anonfield(typs[26]), anonfield(typs[6]), anonfield(typs[6]), anonfield(typs[6])}, []*Node{anonfield(typs[6])})
-       typs[29] = functype(nil, []*Node{anonfield(typs[26]), anonfield(typs[6]), anonfield(typs[6]), anonfield(typs[6]), anonfield(typs[6])}, []*Node{anonfield(typs[6])})
-       typs[30] = functype(nil, []*Node{anonfield(typs[26]), anonfield(typs[6]), anonfield(typs[6]), anonfield(typs[6]), anonfield(typs[6]), anonfield(typs[6])}, []*Node{anonfield(typs[6])})
-       typs[31] = typSlice(typs[6])
-       typs[32] = functype(nil, []*Node{anonfield(typs[26]), anonfield(typs[31])}, []*Node{anonfield(typs[6])})
-       typs[33] = Types[TINT]
-       typs[34] = functype(nil, []*Node{anonfield(typs[6]), anonfield(typs[6])}, []*Node{anonfield(typs[33])})
-       typs[35] = functype(nil, []*Node{anonfield(typs[6]), anonfield(typs[6])}, []*Node{anonfield(typs[13])})
-       typs[36] = typArray(typs[0], 4)
-       typs[37] = typPtr(typs[36])
-       typs[38] = functype(nil, []*Node{anonfield(typs[37]), anonfield(typs[17])}, []*Node{anonfield(typs[6])})
-       typs[39] = typSlice(typs[0])
-       typs[40] = functype(nil, []*Node{anonfield(typs[26]), anonfield(typs[39])}, []*Node{anonfield(typs[6])})
-       typs[41] = functype(nil, []*Node{anonfield(typs[39])}, []*Node{anonfield(typs[6])})
-       typs[42] = runetype
-       typs[43] = typSlice(typs[42])
-       typs[44] = functype(nil, []*Node{anonfield(typs[26]), anonfield(typs[43])}, []*Node{anonfield(typs[6])})
-       typs[45] = functype(nil, []*Node{anonfield(typs[26]), anonfield(typs[6])}, []*Node{anonfield(typs[39])})
-       typs[46] = typArray(typs[42], 32)
-       typs[47] = typPtr(typs[46])
-       typs[48] = functype(nil, []*Node{anonfield(typs[47]), anonfield(typs[6])}, []*Node{anonfield(typs[43])})
-       typs[49] = functype(nil, []*Node{anonfield(typs[6]), anonfield(typs[33])}, []*Node{anonfield(typs[42]), anonfield(typs[33])})
-       typs[50] = Types[TUINTPTR]
-       typs[51] = functype(nil, []*Node{anonfield(typs[2]), anonfield(typs[2]), anonfield(typs[50])}, []*Node{anonfield(typs[33])})
-       typs[52] = functype(nil, []*Node{anonfield(typs[2]), anonfield(typs[2])}, []*Node{anonfield(typs[33])})
-       typs[53] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[2])}, []*Node{anonfield(typs[2])})
-       typs[54] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[3])}, []*Node{anonfield(typs[2])})
-       typs[55] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[2])}, []*Node{anonfield(typs[2]), anonfield(typs[13])})
-       typs[56] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[1]), anonfield(typs[1])}, nil)
-       typs[57] = functype(nil, []*Node{anonfield(typs[1])}, nil)
-       typs[58] = functype(nil, []*Node{anonfield(typs[2]), anonfield(typs[2])}, []*Node{anonfield(typs[13])})
-       typs[59] = typMap(typs[2], typs[2])
-       typs[60] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[17]), anonfield(typs[3]), anonfield(typs[3])}, []*Node{anonfield(typs[59])})
-       typs[61] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[59]), anonfield(typs[3])}, []*Node{anonfield(typs[3])})
-       typs[62] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[59]), anonfield(typs[2])}, []*Node{anonfield(typs[3])})
-       typs[63] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[59]), anonfield(typs[3]), anonfield(typs[1])}, []*Node{anonfield(typs[3])})
-       typs[64] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[59]), anonfield(typs[3])}, []*Node{anonfield(typs[3]), anonfield(typs[13])})
-       typs[65] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[59]), anonfield(typs[2])}, []*Node{anonfield(typs[3]), anonfield(typs[13])})
-       typs[66] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[59]), anonfield(typs[3]), anonfield(typs[1])}, []*Node{anonfield(typs[3]), anonfield(typs[13])})
-       typs[67] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[59]), anonfield(typs[3])}, nil)
-       typs[68] = functype(nil, []*Node{anonfield(typs[3])}, nil)
-       typs[69] = typChan(typs[2], Cboth)
-       typs[70] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[17])}, []*Node{anonfield(typs[69])})
-       typs[71] = typChan(typs[2], Crecv)
-       typs[72] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[71]), anonfield(typs[3])}, nil)
-       typs[73] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[71]), anonfield(typs[3])}, []*Node{anonfield(typs[13])})
-       typs[74] = typChan(typs[2], Csend)
-       typs[75] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[74]), anonfield(typs[3])}, nil)
-       typs[76] = tostruct([]*Node{namedfield("enabled", typs[13]), namedfield("needed", typs[13]), namedfield("cgo", typs[13])})
-       typs[77] = functype(nil, []*Node{anonfield(typs[3]), anonfield(typs[2])}, nil)
-       typs[78] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[3]), anonfield(typs[3])}, nil)
-       typs[79] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[3])}, nil)
-       typs[80] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[2]), anonfield(typs[2])}, []*Node{anonfield(typs[33])})
-       typs[81] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[74]), anonfield(typs[3])}, []*Node{anonfield(typs[13])})
-       typs[82] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[3]), anonfield(typs[71])}, []*Node{anonfield(typs[13])})
-       typs[83] = typPtr(typs[13])
-       typs[84] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[3]), anonfield(typs[83]), anonfield(typs[71])}, []*Node{anonfield(typs[13])})
-       typs[85] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[17]), anonfield(typs[10])}, nil)
-       typs[86] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[71]), anonfield(typs[3]), anonfield(typs[83])}, []*Node{anonfield(typs[13])})
-       typs[87] = functype(nil, []*Node{anonfield(typs[1])}, []*Node{anonfield(typs[13])})
-       typs[88] = typSlice(typs[2])
-       typs[89] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[33]), anonfield(typs[33])}, []*Node{anonfield(typs[88])})
-       typs[90] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[17]), anonfield(typs[17])}, []*Node{anonfield(typs[88])})
-       typs[91] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[88]), anonfield(typs[33])}, []*Node{anonfield(typs[88])})
-       typs[92] = functype(nil, []*Node{anonfield(typs[3]), anonfield(typs[3]), anonfield(typs[50])}, nil)
-       typs[93] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[50])}, nil)
-       typs[94] = functype(nil, []*Node{anonfield(typs[3]), anonfield(typs[3]), anonfield(typs[50])}, []*Node{anonfield(typs[13])})
-       typs[95] = functype(nil, []*Node{anonfield(typs[3]), anonfield(typs[3])}, []*Node{anonfield(typs[13])})
+       typs[23] = functype(nil, []*Node{anonfield(typs[2])}, nil)
+       typs[24] = typArray(typs[0], 32)
+       typs[25] = typPtr(typs[24])
+       typs[26] = functype(nil, []*Node{anonfield(typs[25]), anonfield(typs[21]), anonfield(typs[21])}, []*Node{anonfield(typs[21])})
+       typs[27] = functype(nil, []*Node{anonfield(typs[25]), anonfield(typs[21]), anonfield(typs[21]), anonfield(typs[21])}, []*Node{anonfield(typs[21])})
+       typs[28] = functype(nil, []*Node{anonfield(typs[25]), anonfield(typs[21]), anonfield(typs[21]), anonfield(typs[21]), anonfield(typs[21])}, []*Node{anonfield(typs[21])})
+       typs[29] = functype(nil, []*Node{anonfield(typs[25]), anonfield(typs[21]), anonfield(typs[21]), anonfield(typs[21]), anonfield(typs[21]), anonfield(typs[21])}, []*Node{anonfield(typs[21])})
+       typs[30] = typSlice(typs[21])
+       typs[31] = functype(nil, []*Node{anonfield(typs[25]), anonfield(typs[30])}, []*Node{anonfield(typs[21])})
+       typs[32] = Types[TINT]
+       typs[33] = functype(nil, []*Node{anonfield(typs[21]), anonfield(typs[21])}, []*Node{anonfield(typs[32])})
+       typs[34] = functype(nil, []*Node{anonfield(typs[21]), anonfield(typs[21])}, []*Node{anonfield(typs[11])})
+       typs[35] = typArray(typs[0], 4)
+       typs[36] = typPtr(typs[35])
+       typs[37] = functype(nil, []*Node{anonfield(typs[36]), anonfield(typs[15])}, []*Node{anonfield(typs[21])})
+       typs[38] = typSlice(typs[0])
+       typs[39] = functype(nil, []*Node{anonfield(typs[25]), anonfield(typs[38])}, []*Node{anonfield(typs[21])})
+       typs[40] = functype(nil, []*Node{anonfield(typs[38])}, []*Node{anonfield(typs[21])})
+       typs[41] = runetype
+       typs[42] = typSlice(typs[41])
+       typs[43] = functype(nil, []*Node{anonfield(typs[25]), anonfield(typs[42])}, []*Node{anonfield(typs[21])})
+       typs[44] = functype(nil, []*Node{anonfield(typs[25]), anonfield(typs[21])}, []*Node{anonfield(typs[38])})
+       typs[45] = typArray(typs[41], 32)
+       typs[46] = typPtr(typs[45])
+       typs[47] = functype(nil, []*Node{anonfield(typs[46]), anonfield(typs[21])}, []*Node{anonfield(typs[42])})
+       typs[48] = functype(nil, []*Node{anonfield(typs[21]), anonfield(typs[32])}, []*Node{anonfield(typs[41]), anonfield(typs[32])})
+       typs[49] = Types[TUINTPTR]
+       typs[50] = functype(nil, []*Node{anonfield(typs[2]), anonfield(typs[2]), anonfield(typs[49])}, []*Node{anonfield(typs[32])})
+       typs[51] = functype(nil, []*Node{anonfield(typs[2]), anonfield(typs[2])}, []*Node{anonfield(typs[32])})
+       typs[52] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[2])}, []*Node{anonfield(typs[2])})
+       typs[53] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[3])}, []*Node{anonfield(typs[2])})
+       typs[54] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[2])}, []*Node{anonfield(typs[2]), anonfield(typs[11])})
+       typs[55] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[1]), anonfield(typs[1])}, nil)
+       typs[56] = functype(nil, []*Node{anonfield(typs[1])}, nil)
+       typs[57] = functype(nil, []*Node{anonfield(typs[2]), anonfield(typs[2])}, []*Node{anonfield(typs[11])})
+       typs[58] = typMap(typs[2], typs[2])
+       typs[59] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[15]), anonfield(typs[3]), anonfield(typs[3])}, []*Node{anonfield(typs[58])})
+       typs[60] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[58]), anonfield(typs[3])}, []*Node{anonfield(typs[3])})
+       typs[61] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[58]), anonfield(typs[2])}, []*Node{anonfield(typs[3])})
+       typs[62] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[58]), anonfield(typs[3]), anonfield(typs[1])}, []*Node{anonfield(typs[3])})
+       typs[63] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[58]), anonfield(typs[3])}, []*Node{anonfield(typs[3]), anonfield(typs[11])})
+       typs[64] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[58]), anonfield(typs[2])}, []*Node{anonfield(typs[3]), anonfield(typs[11])})
+       typs[65] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[58]), anonfield(typs[3]), anonfield(typs[1])}, []*Node{anonfield(typs[3]), anonfield(typs[11])})
+       typs[66] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[58]), anonfield(typs[3])}, nil)
+       typs[67] = functype(nil, []*Node{anonfield(typs[3])}, nil)
+       typs[68] = typChan(typs[2], Cboth)
+       typs[69] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[15])}, []*Node{anonfield(typs[68])})
+       typs[70] = typChan(typs[2], Crecv)
+       typs[71] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[70]), anonfield(typs[3])}, nil)
+       typs[72] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[70]), anonfield(typs[3])}, []*Node{anonfield(typs[11])})
+       typs[73] = typChan(typs[2], Csend)
+       typs[74] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[73]), anonfield(typs[3])}, nil)
+       typs[75] = tostruct([]*Node{namedfield("enabled", typs[11]), namedfield("needed", typs[11]), namedfield("cgo", typs[11])})
+       typs[76] = functype(nil, []*Node{anonfield(typs[3]), anonfield(typs[2])}, nil)
+       typs[77] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[3]), anonfield(typs[3])}, nil)
+       typs[78] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[3])}, nil)
+       typs[79] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[2]), anonfield(typs[2])}, []*Node{anonfield(typs[32])})
+       typs[80] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[73]), anonfield(typs[3])}, []*Node{anonfield(typs[11])})
+       typs[81] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[3]), anonfield(typs[70])}, []*Node{anonfield(typs[11])})
+       typs[82] = typPtr(typs[11])
+       typs[83] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[3]), anonfield(typs[82]), anonfield(typs[70])}, []*Node{anonfield(typs[11])})
+       typs[84] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[15]), anonfield(typs[8])}, nil)
+       typs[85] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[70]), anonfield(typs[3]), anonfield(typs[82])}, []*Node{anonfield(typs[11])})
+       typs[86] = functype(nil, []*Node{anonfield(typs[1])}, []*Node{anonfield(typs[11])})
+       typs[87] = typSlice(typs[2])
+       typs[88] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[32]), anonfield(typs[32])}, []*Node{anonfield(typs[87])})
+       typs[89] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[15]), anonfield(typs[15])}, []*Node{anonfield(typs[87])})
+       typs[90] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[87]), anonfield(typs[32])}, []*Node{anonfield(typs[87])})
+       typs[91] = functype(nil, []*Node{anonfield(typs[3]), anonfield(typs[3]), anonfield(typs[49])}, nil)
+       typs[92] = functype(nil, []*Node{anonfield(typs[1]), anonfield(typs[49])}, nil)
+       typs[93] = functype(nil, []*Node{anonfield(typs[3]), anonfield(typs[3]), anonfield(typs[49])}, []*Node{anonfield(typs[11])})
+       typs[94] = functype(nil, []*Node{anonfield(typs[3]), anonfield(typs[3])}, []*Node{anonfield(typs[11])})
+       typs[95] = functype(nil, []*Node{anonfield(typs[15]), anonfield(typs[15])}, []*Node{anonfield(typs[15])})
        typs[96] = functype(nil, []*Node{anonfield(typs[17]), anonfield(typs[17])}, []*Node{anonfield(typs[17])})
-       typs[97] = functype(nil, []*Node{anonfield(typs[19]), anonfield(typs[19])}, []*Node{anonfield(typs[19])})
-       typs[98] = functype(nil, []*Node{anonfield(typs[15])}, []*Node{anonfield(typs[17])})
-       typs[99] = functype(nil, []*Node{anonfield(typs[15])}, []*Node{anonfield(typs[19])})
-       typs[100] = Types[TUINT32]
-       typs[101] = functype(nil, []*Node{anonfield(typs[15])}, []*Node{anonfield(typs[100])})
-       typs[102] = functype(nil, []*Node{anonfield(typs[17])}, []*Node{anonfield(typs[15])})
-       typs[103] = functype(nil, []*Node{anonfield(typs[19])}, []*Node{anonfield(typs[15])})
-       typs[104] = functype(nil, []*Node{anonfield(typs[100])}, []*Node{anonfield(typs[15])})
-       typs[105] = functype(nil, []*Node{anonfield(typs[21]), anonfield(typs[21])}, []*Node{anonfield(typs[21])})
-       typs[106] = functype(nil, []*Node{anonfield(typs[50])}, nil)
-       typs[107] = functype(nil, []*Node{anonfield(typs[50]), anonfield(typs[50])}, nil)
+       typs[97] = functype(nil, []*Node{anonfield(typs[13])}, []*Node{anonfield(typs[15])})
+       typs[98] = functype(nil, []*Node{anonfield(typs[13])}, []*Node{anonfield(typs[17])})
+       typs[99] = Types[TUINT32]
+       typs[100] = functype(nil, []*Node{anonfield(typs[13])}, []*Node{anonfield(typs[99])})
+       typs[101] = functype(nil, []*Node{anonfield(typs[15])}, []*Node{anonfield(typs[13])})
+       typs[102] = functype(nil, []*Node{anonfield(typs[17])}, []*Node{anonfield(typs[13])})
+       typs[103] = functype(nil, []*Node{anonfield(typs[99])}, []*Node{anonfield(typs[13])})
+       typs[104] = functype(nil, []*Node{anonfield(typs[19]), anonfield(typs[19])}, []*Node{anonfield(typs[19])})
+       typs[105] = functype(nil, []*Node{anonfield(typs[49])}, nil)
+       typs[106] = functype(nil, []*Node{anonfield(typs[49]), anonfield(typs[49])}, nil)
        return typs[:]
 }

diff --git a/src/cmd/compile/internal/gc/builtin/runtime.go b/src/cmd/compile/internal/gc/builtin/runtime.go
index 69511155f4728b431531d51f14139861e9f84b13..e9d41a3095f02a98362e736e113c3fd74bc22ef6 100644 (file)
--- a/src/cmd/compile/internal/gc/builtin/runtime.go
+++ b/src/cmd/compile/internal/gc/builtin/runtime.go
@@ -17,7 +17,7 @@ func panicindex()
 func panicslice()
 func panicdivide()
 func throwinit()
-func panicwrap(string, string, string)
+func panicwrap()
 
 func gopanic(interface{})
 func gorecover(*int32) interface{}

diff --git a/src/cmd/compile/internal/gc/subr.go b/src/cmd/compile/internal/gc/subr.go
index 9dd2adcd4c3891016c32e7df5a07b84890728656..c7b81858cccc8679003fbfe06e0e6a8493c2056d 100644 (file)
--- a/src/cmd/compile/internal/gc/subr.go
+++ b/src/cmd/compile/internal/gc/subr.go
@@ -1759,22 +1759,8 @@ func genwrapper(rcvr *Type, method *Field, newnam *Sym, iface int) {
        if rcvr.IsPtr() && rcvr.Elem() == methodrcvr {
                // generating wrapper from *T to T.
                n := nod(OIF, nil, nil)
-
                n.Left = nod(OEQ, this.Left, nodnil())
-
-               // these strings are already in the reflect tables,
-               // so no space cost to use them here.
-               var l []*Node
-
-               var v Val
-               v.U = rcvr.Elem().Sym.Pkg.Name // package name
-               l = append(l, nodlit(v))
-               v.U = rcvr.Elem().Sym.Name // type name
-               l = append(l, nodlit(v))
-               v.U = method.Sym.Name
-               l = append(l, nodlit(v)) // method name
                call := nod(OCALL, syslook("panicwrap"), nil)
-               call.List.Set(l)
                n.Nbody.Set1(call)
                fn.Nbody.Append(n)
        }

diff --git a/src/cmd/internal/obj/x86/obj6.go b/src/cmd/internal/obj/x86/obj6.go
index ec73bb332774b001fa068016a4f9cea34ccd893d..7b644cb6b1f7fe6f520dc34a7851403c55ea2a45 100644 (file)
--- a/src/cmd/internal/obj/x86/obj6.go
+++ b/src/cmd/internal/obj/x86/obj6.go
@@ -953,7 +953,7 @@ func isZeroArgRuntimeCall(s *obj.LSym) bool {
                return false
        }
        switch s.Name {
-       case "runtime.panicindex", "runtime.panicslice", "runtime.panicdivide":
+       case "runtime.panicindex", "runtime.panicslice", "runtime.panicdivide", "runtime.panicwrap":
                return true
        }
        return false

diff --git a/src/runtime/error.go b/src/runtime/error.go
index 0238c5e5924ca6b686bc812b6c63afa958195b58..f5b015c091d43388ecdce811a75105a5b18cf64f 100644 (file)
--- a/src/runtime/error.go
+++ b/src/runtime/error.go
@@ -4,6 +4,8 @@
 
 package runtime
 
+import _ "unsafe" // for go:linkname
+
 // The Error interface identifies a run time error.
 type Error interface {
        error
@@ -91,7 +93,41 @@ func printany(i interface{}) {
        }
 }
 
+// strings.IndexByte is implemented in runtime/asm_$goarch.s
+// but amusingly we need go:linkname to get access to it here in the runtime.
+//go:linkname stringsIndexByte strings.IndexByte
+func stringsIndexByte(s string, c byte) int
+
 // called from generated code
-func panicwrap(pkg, typ, meth string) {
+func panicwrap() {
+       pc := make([]uintptr, 1)
+       n := Callers(2, pc)
+       if n == 0 {
+               throw("panicwrap: Callers failed")
+       }
+       frames := CallersFrames(pc)
+       frame, _ := frames.Next()
+       name := frame.Function
+       // name is something like "main.(*T).F".
+       // We want to extract pkg ("main"), typ ("T"), and meth ("F").
+       // Do it by finding the parens.
+       i := stringsIndexByte(name, '(')
+       if i < 0 {
+               throw("panicwrap: no ( in " + frame.Function)
+       }
+       pkg := name[:i-1]
+       if i+2 >= len(name) || name[i-1:i+2] != ".(*" {
+               throw("panicwrap: unexpected string after package name: " + frame.Function)
+       }
+       name = name[i+2:]
+       i = stringsIndexByte(name, ')')
+       if i < 0 {
+               throw("panicwrap: no ) in " + frame.Function)
+       }
+       if i+2 >= len(name) || name[i:i+2] != ")." {
+               throw("panicwrap: unexpected string after type name: " + frame.Function)
+       }
+       typ := name[:i]
+       meth := name[i+2:]
        panic(plainError("value method " + pkg + "." + typ + "." + meth + " called using nil *" + typ + " pointer"))
 }

diff --git a/test/fixedbugs/issue19040.go b/test/fixedbugs/issue19040.go
new file mode 100644 (file)
index 0000000..67881df
--- /dev/null
+++ b/test/fixedbugs/issue19040.go
@@ -0,0 +1,36 @@
+// run
+
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Check the text of the panic that comes from
+// a nil pointer passed to automatically generated method wrapper.
+
+package main
+
+import "fmt"
+
+type T int
+
+type I interface {
+       F()
+}
+
+func (t T) F() {}
+
+var (
+       t *T
+       i I = t
+)
+
+func main() {
+       defer func() {
+               got := recover().(error).Error()
+               want := "value method main.T.F called using nil *T pointer"
+               if got != want {
+                       fmt.Printf("panicwrap error text:\n\t%q\nwant:\n\t%q\n", got, want)
+               }
+       }()
+       i.F()
+}