diff options
| author | Ian Lance Taylor <iant@golang.org> | 2020-10-01 15:11:22 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-10-01 16:10:17 -0700 |
| commit | 3e52eaab8c57ad06bcd553f140923a34e5749991 (patch) | |
| tree | aefb9c7afe93c5278b9850695b7bd04af33cd99b | |
| parent | 4c69e61f4307865b95151006e480ae2022b30454 (diff) | |
| download | gcc-3e52eaab8c57ad06bcd553f140923a34e5749991.zip gcc-3e52eaab8c57ad06bcd553f140923a34e5749991.tar.gz gcc-3e52eaab8c57ad06bcd553f140923a34e5749991.tar.bz2 | |
compiler: set varargs correctly for type of method expression
Fixes golang/go#41737
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/258977
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | gcc/go/gofrontend/types.cc | 8 | ||||
| -rw-r--r-- | libgo/go/reflect/all_test.go | 8 |
3 files changed, 14 insertions, 4 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 8d9fda5..9482740 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -c9c084bce713e258721e12041a351ec8ad33ad17 +801c458a562d22260ff176c26d65639dd32c8a90 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/gcc/go/gofrontend/types.cc b/gcc/go/gofrontend/types.cc index 7f65b4a..e7a742f 100644 --- a/gcc/go/gofrontend/types.cc +++ b/gcc/go/gofrontend/types.cc @@ -5350,8 +5350,12 @@ Function_type::copy_with_receiver_as_param(bool want_pointer_receiver) const ++p) new_params->push_back(*p); } - return Type::make_function_type(NULL, new_params, this->results_, - this->location_); + Function_type* ret = Type::make_function_type(NULL, new_params, + this->results_, + this->location_); + if (this->is_varargs_) + ret->set_is_varargs(); + return ret; } // Make a copy of a function type ignoring any receiver and adding a diff --git a/libgo/go/reflect/all_test.go b/libgo/go/reflect/all_test.go index ee37359..68efab6 100644 --- a/libgo/go/reflect/all_test.go +++ b/libgo/go/reflect/all_test.go @@ -2396,8 +2396,14 @@ func TestVariadicMethodValue(t *testing.T) { points := []Point{{20, 21}, {22, 23}, {24, 25}} want := int64(p.TotalDist(points[0], points[1], points[2])) + // Variadic method of type. + tfunc := TypeOf((func(Point, ...Point) int)(nil)) + if tt := TypeOf(p).Method(4).Type; tt != tfunc { + t.Errorf("Variadic Method Type from TypeOf is %s; want %s", tt, tfunc) + } + // Curried method of value. - tfunc := TypeOf((func(...Point) int)(nil)) + tfunc = TypeOf((func(...Point) int)(nil)) v := ValueOf(p).Method(4) if tt := v.Type(); tt != tfunc { t.Errorf("Variadic Method Type is %s; want %s", tt, tfunc) |