  	}
  	nimports += testDir(t, "", time.Now().Add(maxTime)) // installed packages
  	t.Logf("tested %d imports", nimports)
-diff -r 6faa19b38832 go/types/builtins.go
---- a/go/types/builtins.go	Thu Nov 14 17:33:07 2013 -0500
-+++ b/go/types/builtins.go	Fri Nov 15 14:37:53 2013 +0100
+diff -r 2fa151649748 go/types/builtins.go
+--- a/go/types/builtins.go
++++ b/go/types/builtins.go
 @@ -557,7 +557,7 @@
  		list[i] = NewVar(token.NoPos, nil, "", defaultType(param))
  	}

 }
 
 // At returns the i'th variable of tuple t.
diff -r 6faa19b38832 go/types/universe.go
--- a/go/types/universe.go	Thu Nov 14 17:33:07 2013 -0500
+++ b/go/types/universe.go	Fri Nov 15 14:37:53 2013 +0100
@@ -65,7 +65,7 @@
 
 	// Error has a nil package in its qualified name since it is in no package

-	x.mode = invalid
-	x.expr = e
 }
diff -r 2fa151649748 go/types/expr.go
--- a/go/types/expr.go
+++ b/go/types/expr.go
@@ -481,7 +481,9 @@
 				check.updateExprType(x.expr, target, false)
 			}
