libgo: Update to Go 1.1.1.

From-SVN: r200974

1 files changed, 18 insertions, 9 deletions

diff --git a/libgo/go/debug/dwarf/entry.go b/libgo/go/debug/dwarf/entry.go
index 4761d74..ada7231 100644
--- a/libgo/go/debug/dwarf/entry.go
+++ b/libgo/go/debug/dwarf/entry.go
@@ -40,7 +40,7 @@ func (d *Data) parseAbbrev(off uint32) (abbrevTable, error) {
 	} else {
 		data = data[off:]
 	}
-	b := makeBuf(d, nil, "abbrev", 0, data)
+	b := makeBuf(d, unknownFormat{}, "abbrev", 0, data)
 
 	// Error handling is simplified by the buf getters
 	// returning an endless stream of 0s after an error.
@@ -190,13 +190,16 @@ func (b *buf) entry(atab abbrevTable, ubase Offset) *Entry {
 		case formFlag:
 			val = b.uint8() == 1
 		case formFlagPresent:
+			// The attribute is implicitly indicated as present, and no value is
+			// encoded in the debugging information entry itself.
 			val = true
 
 		// lineptr, loclistptr, macptr, rangelistptr
 		case formSecOffset:
-			if b.u == nil {
+			is64, known := b.format.dwarf64()
+			if !known {
 				b.error("unknown size for DW_FORM_sec_offset")
-			} else if b.u.dwarf64 {
+			} else if is64 {
 				val = Offset(b.uint64())
 			} else {
 				val = Offset(b.uint32())
@@ -204,14 +207,20 @@ func (b *buf) entry(atab abbrevTable, ubase Offset) *Entry {
 
 		// reference to other entry
 		case formRefAddr:
-			if b.u == nil {
+			vers := b.format.version()
+			if vers == 0 {
 				b.error("unknown version for DW_FORM_ref_addr")
-			} else if b.u.version == 2 {
+			} else if vers == 2 {
 				val = Offset(b.addr())
-			} else if b.u.dwarf64 {
-				val = Offset(b.uint64())
 			} else {
-				val = Offset(b.uint32())
+				is64, known := b.format.dwarf64()
+				if !known {
+					b.error("unknown size for DW_FORM_ref_addr")
+				} else if is64 {
+					val = Offset(b.uint64())
+				} else {
+					val = Offset(b.uint32())
+				}
 			}
 		case formRef1:
 			val = Offset(b.uint8()) + ubase
@@ -234,7 +243,7 @@ func (b *buf) entry(atab abbrevTable, ubase Offset) *Entry {
 			if b.err != nil {
 				return nil
 			}
-			b1 := makeBuf(b.dwarf, b.u, "str", 0, b.dwarf.str)
+			b1 := makeBuf(b.dwarf, unknownFormat{}, "str", 0, b.dwarf.str)
 			b1.skip(int(off))
 			val = b1.string()
 			if b1.err != nil {