From: Josh Bleecher Snyder Date: Tue, 21 Mar 2017 19:13:12 +0000 (-0700) Subject: cmd/compile: eliminate a Curfn reference in plive X-Git-Tag: go1.9beta1~1059 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=89840e4ac9525ddff2b04a8f17fe5b85e96f9bdc;p=gostls13.git cmd/compile: eliminate a Curfn reference in plive I think this got lost in a rebase somewhere. Updates #15756 Change-Id: Ia3e7c60d1b9254f2877217073732b46c91059ade Reviewed-on: https://go-review.googlesource.com/38425 Run-TryBot: Josh Bleecher Snyder Reviewed-by: Matthew Dempsky TryBot-Result: Gobot Gobot --- diff --git a/src/cmd/compile/internal/gc/plive.go b/src/cmd/compile/internal/gc/plive.go index 8b8882ac55..548f1ea6c6 100644 --- a/src/cmd/compile/internal/gc/plive.go +++ b/src/cmd/compile/internal/gc/plive.go @@ -413,8 +413,8 @@ func localswords(lv *Liveness) int32 { } // Returns the number of words of in and out arguments. -func argswords() int32 { - return int32(Curfn.Type.ArgWidth() / int64(Widthptr)) +func argswords(lv *Liveness) int32 { + return int32(lv.fn.Type.ArgWidth() / int64(Widthptr)) } // Generates live pointer value maps for arguments and local variables. The @@ -1082,7 +1082,7 @@ func finishgclocals(sym *Sym) { // length of the bitmaps. All bitmaps are assumed to be of equal length. The // remaining bytes are the raw bitmaps. func livenessemit(lv *Liveness, argssym, livesym *Sym) { - args := bvalloc(argswords()) + args := bvalloc(argswords(lv)) aoff := duint32(argssym, 0, uint32(len(lv.livevars))) // number of bitmaps aoff = duint32(argssym, aoff, uint32(args.n)) // number of bits in each bitmap