diff options
| author | Russ Cox <rsc@golang.org> | 2015-07-29 19:04:35 -0400 |
|---|---|---|
| committer | Andrew Gerrand <adg@golang.org> | 2015-07-29 23:50:20 +0000 |
| commit | d3ffc975f38890abbd8ca3f7833772e6423297e8 (patch) | |
| tree | 9f999feed4d22eb79973d23b1760da5d241fc2ab | |
| parent | e4bd8e04087ac9e7c8b754df2d01ff7dddb13ba6 (diff) | |
| download | go1.5beta3.tar.gz go1.5beta3.zip | |
runtime: set invalidptr=1 by default, as documentedgo1.5beta3
Also make invalidptr control the recently added GC pointer check,
as documented.
Change-Id: Iccfdf49480219d12be8b33b8f03d8312d8ceabed
Reviewed-on: https://go-review.googlesource.com/12857
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Rob Pike <r@golang.org>
| -rw-r--r-- | src/runtime/mbitmap.go | 2 | ||||
| -rw-r--r-- | src/runtime/runtime1.go | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/runtime/mbitmap.go b/src/runtime/mbitmap.go index b9b52a7bc4..c439158f07 100644 --- a/src/runtime/mbitmap.go +++ b/src/runtime/mbitmap.go @@ -201,7 +201,7 @@ func heapBitsForObject(p uintptr) (base uintptr, hbits heapBits, s *mspan) { // The following ensures that we are rigorous about what data // structures hold valid pointers. // TODO(rsc): Check if this still happens. - if true { + if debug.invalidptr != 0 { // Still happens sometimes. We don't know why. printlock() print("runtime:objectstart Span weird: p=", hex(p), " k=", hex(k)) diff --git a/src/runtime/runtime1.go b/src/runtime/runtime1.go index db26995703..a50e5b618c 100644 --- a/src/runtime/runtime1.go +++ b/src/runtime/runtime1.go @@ -299,8 +299,6 @@ type dbgVar struct { value *int32 } -// TODO(rsc): Make GC respect debug.invalidptr. - // Holds variables parsed from GODEBUG env var, // except for "memprofilerate" since there is an // existing int var for that value, which may @@ -340,6 +338,9 @@ var dbgvars = []dbgVar{ } func parsedebugvars() { + // defaults + debug.invalidptr = 1 + for p := gogetenv("GODEBUG"); p != ""; { field := "" i := index(p, ",") |