summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2014-10-27 15:57:07 -0400
committerRuss Cox <rsc@golang.org>2014-10-27 15:57:07 -0400
commit297ae6e1545a6982878a82114d5d2d40da373ca6 (patch)
tree841b47c8fd6115aadf99e6db11a47c086e7f8526
parent9c3e9321435fd5c96624b1a199e1834d3eb08a2f (diff)
downloadgo-297ae6e1545a6982878a82114d5d2d40da373ca6.tar.gz
[dev.garbage] runtime: fix TestLFStack on 386
LGTM=rlh R=rlh, dvyukov CC=golang-codereviews https://codereview.appspot.com/157430044
-rw-r--r--src/runtime/export_test.go2
-rw-r--r--src/runtime/lfstack_test.go2
-rw-r--r--src/runtime/runtime.h1
3 files changed, 3 insertions, 2 deletions
diff --git a/src/runtime/export_test.go b/src/runtime/export_test.go
index be352557f..65e918e84 100644
--- a/src/runtime/export_test.go
+++ b/src/runtime/export_test.go
@@ -26,7 +26,7 @@ var Exitsyscall = exitsyscall
var LockedOSThread = lockedOSThread
type LFNode struct {
- Next *LFNode
+ Next uint64
Pushcnt uintptr
}
diff --git a/src/runtime/lfstack_test.go b/src/runtime/lfstack_test.go
index e51877704..68f221d6e 100644
--- a/src/runtime/lfstack_test.go
+++ b/src/runtime/lfstack_test.go
@@ -121,7 +121,7 @@ func TestLFStackStress(t *testing.T) {
}
cnt++
sum2 += node.data
- node.Next = nil
+ node.Next = 0
}
}
if cnt != K {
diff --git a/src/runtime/runtime.h b/src/runtime/runtime.h
index cbbf6b3fc..c1bba423a 100644
--- a/src/runtime/runtime.h
+++ b/src/runtime/runtime.h
@@ -571,6 +571,7 @@ enum {
#endif
// Lock-free stack node.
+// Also known to export_test.go.
struct LFNode
{
uint64 next;