Skip to content

Commit aeb256e

Browse files
committed
cmd/compile: remove unused arg from gorecover
We don't need this argument anymore to match up a recover with its corresponding panic. Change-Id: I5d3646cdd766259ee9d3d995a2f215f02e17abc6 Reviewed-on: https://go-review.googlesource.com/c/go/+/685555 Reviewed-by: Michael Knyszek <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Keith Randall <[email protected]> Reviewed-by: Cuong Manh Le <[email protected]>
1 parent 08376e1 commit aeb256e

File tree

18 files changed

+398
-417
lines changed

18 files changed

+398
-417
lines changed

src/cmd/compile/internal/escape/call.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ func (e *escape) call(ks []hole, call ir.Node) {
192192
e.discard(call.X)
193193
e.discard(call.Y)
194194

195-
case ir.ODELETE, ir.OPRINT, ir.OPRINTLN, ir.ORECOVERFP:
195+
case ir.ODELETE, ir.OPRINT, ir.OPRINTLN, ir.ORECOVER:
196196
call := call.(*ir.CallExpr)
197197
for _, arg := range call.Args {
198198
e.discard(arg)

src/cmd/compile/internal/escape/expr.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func (e *escape) exprSkipInit(k hole, n ir.Node) {
139139
e.discard(n.X)
140140

141141
case ir.OCALLMETH, ir.OCALLFUNC, ir.OCALLINTER, ir.OINLCALL,
142-
ir.OLEN, ir.OCAP, ir.OMIN, ir.OMAX, ir.OCOMPLEX, ir.OREAL, ir.OIMAG, ir.OAPPEND, ir.OCOPY, ir.ORECOVERFP,
142+
ir.OLEN, ir.OCAP, ir.OMIN, ir.OMAX, ir.OCOMPLEX, ir.OREAL, ir.OIMAG, ir.OAPPEND, ir.OCOPY, ir.ORECOVER,
143143
ir.OUNSAFEADD, ir.OUNSAFESLICE, ir.OUNSAFESTRING, ir.OUNSAFESTRINGDATA, ir.OUNSAFESLICEDATA:
144144
e.call([]hole{k}, n)
145145

src/cmd/compile/internal/escape/stmt.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ func (e *escape) stmt(n ir.Node) {
183183
dsts[i] = res.Nname.(*ir.Name)
184184
}
185185
e.assignList(dsts, n.Results, "return", n)
186-
case ir.OCALLFUNC, ir.OCALLMETH, ir.OCALLINTER, ir.OINLCALL, ir.OCLEAR, ir.OCLOSE, ir.OCOPY, ir.ODELETE, ir.OPANIC, ir.OPRINT, ir.OPRINTLN, ir.ORECOVERFP:
186+
case ir.OCALLFUNC, ir.OCALLMETH, ir.OCALLINTER, ir.OINLCALL, ir.OCLEAR, ir.OCLOSE, ir.OCOPY, ir.ODELETE, ir.OPANIC, ir.OPRINT, ir.OPRINTLN, ir.ORECOVER:
187187
e.call(nil, n)
188188
case ir.OGO, ir.ODEFER:
189189
n := n.(*ir.GoDeferStmt)

src/cmd/compile/internal/inline/inl.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -605,10 +605,7 @@ opSwitch:
605605
v.budget -= inlineExtraPanicCost
606606

607607
case ir.ORECOVER:
608-
base.FatalfAt(n.Pos(), "ORECOVER missed typecheck")
609-
case ir.ORECOVERFP:
610-
// recover matches the argument frame pointer to find
611-
// the right panic value, so it needs an argument frame.
608+
// TODO: maybe we could allow inlining of recover() now?
612609
v.reason = "call to recover"
613610
return true
614611

src/cmd/compile/internal/inline/inlheur/analyze_func_flags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ func (ffa *funcFlagsAnalyzer) nodeVisitPost(n ir.Node) {
335335
ir.OPRINTLN, ir.OPRINT, ir.OLABEL, ir.OCALLINTER, ir.ODEFER,
336336
ir.OSEND, ir.ORECV, ir.OSELRECV2, ir.OGO, ir.OAPPEND, ir.OAS2DOTTYPE,
337337
ir.OAS2MAPR, ir.OGETG, ir.ODELETE, ir.OINLMARK, ir.OAS2RECV,
338-
ir.OMIN, ir.OMAX, ir.OMAKE, ir.ORECOVERFP, ir.OGETCALLERSP:
338+
ir.OMIN, ir.OMAX, ir.OMAKE, ir.OGETCALLERSP:
339339
// these should all be benign/uninteresting
340340
case ir.OTAILCALL, ir.OJUMPTABLE, ir.OTYPESW:
341341
// don't expect to see these at all.

src/cmd/compile/internal/ir/expr.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ func (n *CallExpr) SetOp(op Op) {
213213
ODELETE,
214214
OGETG, OGETCALLERSP,
215215
OMAKE, OMAX, OMIN, OPRINT, OPRINTLN,
216-
ORECOVER, ORECOVERFP:
216+
ORECOVER:
217217
n.op = op
218218
}
219219
}

src/cmd/compile/internal/ir/node.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ const (
234234
OSLICEHEADER // sliceheader{Ptr, Len, Cap} (Ptr is unsafe.Pointer, Len is length, Cap is capacity)
235235
OSTRINGHEADER // stringheader{Ptr, Len} (Ptr is unsafe.Pointer, Len is length)
236236
ORECOVER // recover()
237-
ORECOVERFP // recover(Args) w/ explicit FP argument
238237
ORECV // <-X
239238
ORUNESTR // Type(X) (Type is string, X is rune)
240239
OSELRECV2 // like OAS2: Lhs = Rhs where len(Lhs)=2, len(Rhs)=1, Rhs[0].Op = ORECV (appears as .Var of OCASE)

src/cmd/compile/internal/ir/op_string.go

Lines changed: 52 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cmd/compile/internal/typecheck/_builtin/runtime.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func throwinit()
2525
func panicwrap()
2626

2727
func gopanic(interface{})
28-
func gorecover(*int32) interface{}
28+
func gorecover() interface{}
2929
func goschedguarded()
3030

3131
// Note: these declarations are just for wasm port.

0 commit comments

Comments
 (0)