fix for gofmt rewrite matcher bug

R=rsc
CC=golang-dev
https://golang.org/cl/179096

diff --git a/src/cmd/gofmt/rewrite.go b/src/cmd/gofmt/rewrite.go
index 94f7912a38b8db2cbacd33d5065b900a235e8245..0fade9f1c1d59d3b6157ed806b50451536f47181 100644 (file)
--- a/src/cmd/gofmt/rewrite.go
+++ b/src/cmd/gofmt/rewrite.go
@@ -134,6 +134,9 @@ func match(m map[string]reflect.Value, pattern, val reflect.Value) bool {
 
        p := reflect.Indirect(pattern)
        v := reflect.Indirect(val)
+       if p == nil || v == nil {
+               return p == nil && v == nil
+       }
 
        switch p := p.(type) {
        case *reflect.SliceValue: