diff options
| author | Chris Broadfoot <cbro@golang.org> | 2015-09-08 18:04:50 +0000 |
|---|---|---|
| committer | Chris Broadfoot <cbro@golang.org> | 2015-09-08 22:38:42 +0000 |
| commit | 878aef8bf9def489ffa4a58208581f37d4d569e9 (patch) | |
| tree | f241844ea6195cca4b776b3a576c38d29b4fd557 | |
| parent | f265044a489c9e572ffc141ed2d0e95f05d451c9 (diff) | |
| download | go-878aef8bf9def489ffa4a58208581f37d4d569e9.tar.gz go-878aef8bf9def489ffa4a58208581f37d4d569e9.zip | |
Revert "[release-branch.go1.5] runtime: check that stack barrier unwind is in sync"
This reverts commit f265044a489c9e572ffc141ed2d0e95f05d451c9.
Change-Id: I454f9da3a40d6724ab106aae904b8e77756aae99
Reviewed-on: https://go-review.googlesource.com/14383
Run-TryBot: Chris Broadfoot <cbro@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
| -rw-r--r-- | src/runtime/asm_amd64.s | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/runtime/asm_amd64.s b/src/runtime/asm_amd64.s index b7bd3dd34f..3b4ca4d012 100644 --- a/src/runtime/asm_amd64.s +++ b/src/runtime/asm_amd64.s @@ -346,12 +346,7 @@ TEXT runtime·stackBarrier(SB),NOSPLIT,$0 MOVQ (g_stkbar+slice_array)(CX), DX MOVQ g_stkbarPos(CX), BX IMULQ $stkbar__size, BX // Too big for SIB. - MOVQ stkbar_savedLRPtr(DX)(BX*1), R8 MOVQ stkbar_savedLRVal(DX)(BX*1), BX - // Assert that we're popping the right saved LR. - CMPQ R8, SP - JNE 2(PC) - MOVL $0, 0 // Record that this stack barrier was hit. ADDQ $1, g_stkbarPos(CX) // Jump to the original return PC. |