From a506bb7d8e33e85878866152ba738206dbef9209 Mon Sep 17 00:00:00 2001
From: Derek Parker <parkerderek86@gmail.com>
Date: Tue, 28 Jul 2015 18:56:55 -0500
Subject: [PATCH] Finish support for Go1.5beta2

---
 dwarf/frame/table.go | 2 +-
 proc/arch.go         | 7 +++----
 proc/stack.go        | 9 ++++++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/dwarf/frame/table.go b/dwarf/frame/table.go
index b4340b75..22fcde30 100644
--- a/dwarf/frame/table.go
+++ b/dwarf/frame/table.go
@@ -291,7 +291,7 @@ func offsetextended(frame *FrameContext) {
 		offset, _ = util.DecodeULEB128(frame.buf)
 	)
 
-	frame.regs[reg] = DWRule{offset: int64(offset), rule: rule_offset}
+	frame.regs[reg] = DWRule{offset: int64(offset) * frame.dataAlignment, rule: rule_offset}
 }
 
 func undefined(frame *FrameContext) {
diff --git a/proc/arch.go b/proc/arch.go
index 5c19c405..7fedbc54 100644
--- a/proc/arch.go
+++ b/proc/arch.go
@@ -37,10 +37,9 @@ func (a *AMD64) SetGStructOffset(ver GoVersion, isextld bool) {
 		a.gStructOffset = 0x8a0
 	case "linux":
 		a.gStructOffset = 0xfffffffffffffff0
-	}
-
-	if isextld || ver.AfterOrEqual(GoVersion{1, 5, -1, 2}) || ver.IsDevel() {
-		a.gStructOffset += 8
+		if isextld || ver.AfterOrEqual(GoVersion{1, 5, -1, 2}) || ver.IsDevel() {
+			a.gStructOffset += 8
+		}
 	}
 }
 
diff --git a/proc/stack.go b/proc/stack.go
index bbb6be54..1dfc3e2c 100644
--- a/proc/stack.go
+++ b/proc/stack.go
@@ -53,13 +53,13 @@ func (dbp *Process) stacktrace(pc, sp uint64, depth int) ([]Location, error) {
 	)
 	f, l, fn := dbp.PCToLine(pc)
 	locations = append(locations, Location{PC: pc, File: f, Line: l, Fn: fn})
-	for i := int64(0); i < int64(depth); i++ {
+	for i := 0; i < depth; i++ {
 		fde, err := dbp.frameEntries.FDEForPC(ret)
 		if err != nil {
 			return nil, err
 		}
 		btoffset += fde.ReturnAddressOffset(ret)
-		retaddr = uintptr(int64(sp) + btoffset + (i * int64(dbp.arch.PtrSize())))
+		retaddr = uintptr(int64(sp) + btoffset + int64(i*dbp.arch.PtrSize()))
 		if retaddr == 0 {
 			return nil, NullAddrError{}
 		}
@@ -72,8 +72,11 @@ func (dbp *Process) stacktrace(pc, sp uint64, depth int) ([]Location, error) {
 			break
 		}
 		f, l, fn = dbp.goSymTable.PCToLine(ret)
+		if fn == nil {
+			break
+		}
 		locations = append(locations, Location{PC: ret, File: f, Line: l, Fn: fn})
-		if fn != nil && fn.Name == "runtime.goexit" {
+		if fn.Name == "runtime.goexit" {
 			break
 		}
 	}