-diff -r a38424bcd78c go/types/expr.go
---- a/go/types/expr.go	Mon Sep 30 12:39:54 2013 -0400
-+++ b/go/types/expr.go	Mon Sep 30 20:21:58 2013 +0200
+diff -r 1d462abd2860 go/types/expr.go
+--- a/go/types/expr.go	Wed Oct 09 16:35:59 2013 -0400
++++ b/go/types/expr.go	Wed Oct 09 22:56:42 2013 +0200
 @@ -723,9 +723,12 @@
  	}
  

 }
 
 // At returns the i'th variable of tuple t.
diff -r a38424bcd78c go/types/universe.go
--- a/go/types/universe.go	Mon Sep 30 12:39:54 2013 -0400
+++ b/go/types/universe.go	Mon Sep 30 20:21:58 2013 +0200
@@ -65,7 +65,7 @@
 
 	// Error has a nil package in its qualified name since it is in no package

 	case constant:
 		typ = x.typ
 		val = x.val
diff -r 1d462abd2860 go/types/gcimporter.go
--- a/go/types/gcimporter.go	Wed Oct 09 16:35:59 2013 -0400
+++ b/go/types/gcimporter.go	Wed Oct 09 22:56:42 2013 +0200
@@ -723,7 +723,8 @@
 func (p *gcParser) parseImportDecl() {
 	p.expectKeyword("import")
 	name := p.parsePackageName()
-	p.getPkg(p.parsePackageId(), name)
+	pkg := p.getPkg(p.id, "")
+	pkg.imports = append(pkg.imports, p.getPkg(p.parsePackageId(), name))
 }
 
 // int_lit = [ "+" | "-" ] { "0" ... "9" } .
diff -r 1d462abd2860 go/types/methodset.go
--- a/go/types/methodset.go	Wed Oct 09 16:35:59 2013 -0400
+++ b/go/types/methodset.go	Wed Oct 09 22:56:42 2013 +0200
@@ -121,8 +121,8 @@
 		var next []embeddedType // embedded types found at current depth
 
