From 45e87cd3ecfe5e579a06493ef8cd43ce9947262c Mon Sep 17 00:00:00 2001 From: Cherry Zhang Date: Sun, 4 Apr 2021 12:20:35 -0400 Subject: [PATCH] cmd/compile: disable tail call for method wrappers when RegabiArgs is enabled Currently, the IR of tailcall does not connect the arguments with the OTAILCALL node, so the arguments are not marshaled correctly. Disable tail call for now. Updates #40724. Change-Id: I39de3ea8e19a23eb63768ab7282d2f870e9c266e Reviewed-on: https://go-review.googlesource.com/c/go/+/307234 Trust: Cherry Zhang Reviewed-by: Than McIntosh Reviewed-by: Austin Clements --- src/cmd/compile/internal/reflectdata/reflect.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cmd/compile/internal/reflectdata/reflect.go b/src/cmd/compile/internal/reflectdata/reflect.go index 3a31e3c951..379735e86b 100644 --- a/src/cmd/compile/internal/reflectdata/reflect.go +++ b/src/cmd/compile/internal/reflectdata/reflect.go @@ -1770,7 +1770,11 @@ func methodWrapper(rcvr *types.Type, method *types.Field) *obj.LSym { // the TOC to the appropriate value for that module. But if it returns // directly to the wrapper's caller, nothing will reset it to the correct // value for that function. - if !base.Flag.Cfg.Instrumenting && rcvr.IsPtr() && methodrcvr.IsPtr() && method.Embedded != 0 && !types.IsInterfaceMethod(method.Type) && !(base.Ctxt.Arch.Name == "ppc64le" && base.Ctxt.Flag_dynlink) { + // + // Disable tailcall for RegabiArgs for now. The IR does not connect the + // arguments with the OTAILCALL node, and the arguments are not marshaled + // correctly. + if !base.Flag.Cfg.Instrumenting && rcvr.IsPtr() && methodrcvr.IsPtr() && method.Embedded != 0 && !types.IsInterfaceMethod(method.Type) && !(base.Ctxt.Arch.Name == "ppc64le" && base.Ctxt.Flag_dynlink) && !objabi.Experiment.RegabiArgs { // generate tail call: adjust pointer receiver and jump to embedded method. left := dot.X // skip final .M if !left.Type().IsPtr() { -- 2.50.0