Fix bug with overlapping typing.

randall77 · Oct 2, 2017 · 088b3f7 · 088b3f7
1 parent 19b8e0d
commit 088b3f7
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/gocore/dwarf.go b/gocore/dwarf.go
@@ -275,9 +275,9 @@ func (c typeChunk) matchingAlignment(d typeChunk) bool {
 		panic("can't check alignment of differently typed chunks")
 	}
 	if c.a >= d.a {
-		return d.a.Sub(c.a)%c.t.Size != 0
+		return d.a.Sub(c.a)%c.t.Size == 0
 	}
-	return c.a.Sub(d.a)%c.t.Size != 0
+	return c.a.Sub(d.a)%c.t.Size == 0
 }
 
 func (c typeChunk) merge(d typeChunk) typeChunk {
@@ -327,9 +327,6 @@ func (p *Program) typeHeap() {
 		if a == 0 { // nil pointer
 			return
 		}
-		if t == nil {
-			return // TODO: why?
-		}
 		i, _ := p.findObjectIndex(a)
 		if i < 0 { // pointer doesn't point to an object in the Go heap
 			return