]> Cypherpunks repositories - gostls13.git/commitdiff
runtime: don't check _defer against nil twice
authorAinar Garipov <gugl.zadolbal@gmail.com>
Fri, 9 Nov 2018 21:01:14 +0000 (00:01 +0300)
committerIan Lance Taylor <iant@golang.org>
Fri, 9 Nov 2018 23:56:58 +0000 (23:56 +0000)
This issue was found by the new vet's nilness check. _defer was already
checked against nil, so don't check it again.

Change-Id: I78725eaec7234b262b3c941e06441ca57f82bdd9
Reviewed-on: https://go-review.googlesource.com/c/148917
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
src/runtime/traceback.go

index d7265b2bb94bd6ee51d652851404129f73cbcca9..9d2f7f037c829ea030ffc5079c4fbd0a96605f55 100644 (file)
@@ -552,9 +552,7 @@ func gentraceback(pc0, sp0, lr0 uintptr, gp *g, skip int, pcbuf *uintptr, max in
        // It's okay in those situations not to use up the entire defer stack:
        // incomplete information then is still better than nothing.
        if callback != nil && n < max && _defer != nil {
-               if _defer != nil {
-                       print("runtime: g", gp.goid, ": leftover defer sp=", hex(_defer.sp), " pc=", hex(_defer.pc), "\n")
-               }
+               print("runtime: g", gp.goid, ": leftover defer sp=", hex(_defer.sp), " pc=", hex(_defer.pc), "\n")
                for _defer = gp._defer; _defer != nil; _defer = _defer.link {
                        print("\tdefer ", _defer, " sp=", hex(_defer.sp), " pc=", hex(_defer.pc), "\n")
                }