  	}
  	nimports += testDir(t, "", time.Now().Add(maxTime)) // installed packages
  	t.Logf("tested %d imports", nimports)
-diff -r 2fa151649748 go/types/builtins.go
+diff -r 524cd67de4a1 go/types/builtins.go
 --- a/go/types/builtins.go
 +++ b/go/types/builtins.go
 @@ -557,7 +557,7 @@

 	}
 
 	if x.mode == typexpr {
@@ -325,13 +330,17 @@
 		m, _ := obj.(*Func)
 		if m == nil {
 			check.invalidOp(e.Pos(), "%s has no method %s", x, sel)

 }
 
 // typeAssertion checks that x.(T) is legal; xtyp must be the type of x.
diff -r 524cd67de4a1 go/types/methodset.go
--- a/go/types/methodset.go
+++ b/go/types/methodset.go
@@ -121,8 +121,8 @@
