text/template: use "IsValid" instead of "!= zero" to compare zero Value

See CL 308769

Change-Id: I0caa0a84215b3d4b8b3dc6f041b6cd9cbe2c0908
GitHub-Last-Rev: e3aa5bde23fe26cbb6711a6ffbf4856a23fa6f54
GitHub-Pull-Request: golang/go#61657
Reviewed-on: https://go-review.googlesource.com/c/go/+/514195
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: David Chase <drchase@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
Reviewed-by: Rob Pike <r@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Run-TryBot: Ian Lance Taylor <iant@google.com>

diff --git a/src/text/template/funcs.go b/src/text/template/funcs.go
index b5a8c9ec50aa8daa19431a5a998872b4474962dc..a949f896fa3d5a5396f8a9750e7eee597ca76831 100644 (file)
--- a/src/text/template/funcs.go
+++ b/src/text/template/funcs.go
@@ -478,7 +478,7 @@ func eq(arg1 reflect.Value, arg2 ...reflect.Value) (bool, error) {
                        case k1 == uintKind && k2 == intKind:
                                truth = arg.Int() >= 0 && arg1.Uint() == uint64(arg.Int())
                        default:
-                               if arg1 != zero && arg != zero {
+                               if arg1.IsValid() && arg.IsValid() {
                                        return false, errBadComparison
                                }
                        }