aboutsummaryrefslogtreecommitdiff
path: root/src/pkg/debug
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2010-03-30 13:15:16 -0700
committerRuss Cox <rsc@golang.org>2010-03-30 13:15:16 -0700
commit1231382b9e18f8b7e0b7cc35248e22236fa2116d (patch)
tree6715e48815f97066f58ee9aec0a55ef4abdb112a /src/pkg/debug
parentac58f646ac63f9e12730ec683dd29367b50961d7 (diff)
downloadgo-1231382b9e18f8b7e0b7cc35248e22236fa2116d.tar.xz
single argument panic on non-darwin and in comments
R=r CC=golang-dev https://golang.org/cl/800042
Diffstat (limited to 'src/pkg/debug')
-rw-r--r--src/pkg/debug/proc/proc_linux.go2
-rw-r--r--src/pkg/debug/proc/regs_linux_386.go4
-rw-r--r--src/pkg/debug/proc/regs_linux_amd64.go4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/pkg/debug/proc/proc_linux.go b/src/pkg/debug/proc/proc_linux.go
index afe8bd9159..5253ea846b 100644
--- a/src/pkg/debug/proc/proc_linux.go
+++ b/src/pkg/debug/proc/proc_linux.go
@@ -430,7 +430,7 @@ func (t *thread) wait() {
t.logTrace("beginning wait")
ev.Waitmsg, ev.err = os.Wait(t.tid, syscall.WALL)
if ev.err == nil && ev.Pid != t.tid {
- panic("Wait returned pid ", ev.Pid, " wanted ", t.tid)
+ panic(fmt.Sprint("Wait returned pid ", ev.Pid, " wanted ", t.tid))
}
if ev.StopSignal() == syscall.SIGSTOP && t.ignoreNextSigstop {
// Spurious SIGSTOP. See Thread.Stop().
diff --git a/src/pkg/debug/proc/regs_linux_386.go b/src/pkg/debug/proc/regs_linux_386.go
index 7c5478d86f..6ba1b75180 100644
--- a/src/pkg/debug/proc/regs_linux_386.go
+++ b/src/pkg/debug/proc/regs_linux_386.go
@@ -92,7 +92,7 @@ func (r *_386Regs) Get(i int) Word {
case 15:
return Word(r.Gs)
}
- panic("invalid register index ", strconv.Itoa(i))
+ panic("invalid register index " + strconv.Itoa(i))
}
func (r *_386Regs) Set(i int, val Word) os.Error {
@@ -130,7 +130,7 @@ func (r *_386Regs) Set(i int, val Word) os.Error {
case 15:
r.Gs = uint16(val)
default:
- panic("invalid register index ", strconv.Itoa(i))
+ panic("invalid register index " + strconv.Itoa(i))
}
return r.setter(&r.PtraceRegs)
}
diff --git a/src/pkg/debug/proc/regs_linux_amd64.go b/src/pkg/debug/proc/regs_linux_amd64.go
index b070b77140..a9f3569d3a 100644
--- a/src/pkg/debug/proc/regs_linux_amd64.go
+++ b/src/pkg/debug/proc/regs_linux_amd64.go
@@ -124,7 +124,7 @@ func (r *amd64Regs) Get(i int) Word {
case 23:
return Word(r.Gs)
}
- panic("invalid register index ", strconv.Itoa(i))
+ panic("invalid register index " + strconv.Itoa(i))
}
func (r *amd64Regs) Set(i int, val Word) os.Error {
@@ -178,7 +178,7 @@ func (r *amd64Regs) Set(i int, val Word) os.Error {
case 23:
r.Gs = uint64(val)
default:
- panic("invalid register index ", strconv.Itoa(i))
+ panic("invalid register index " + strconv.Itoa(i))
}
return r.setter(&r.PtraceRegs)
}