qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 04:04:40 -07:00
Code Releases Activity

encoding/json, text/template: use reflect.Value.Equal instead of ==

Browse Source 
This change applies a fix for a reflect.Value incorrect comparison
using "==" or reflect.DeepEqual.
This change is a precursor to the change that'll bring in the
static analyzer "reflectvaluecompare", by ensuring that all tests
pass beforehand.

Updates #43993

Change-Id: I6c47eb0a1de6353ac7495cb8cb49b318b7ebba56
Reviewed-on: https://go-review.googlesource.com/c/go/+/626116
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Run-TryBot: Emmanuel Odeke <emmanuel@orijtech.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: David Chase <drchase@google.com>
This commit is contained in:
Emmanuel T Odeke 2024-11-07 17:40:08 -08:00 committed by Gopher Robot
parent 2b33434287
commit 64e7f66b26
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/encoding/json/decode.go
View File

@ -472,7 +472,7 @@ func indirect(v reflect.Value, decodingNull bool) (Unmarshaler, encoding.TextUnm
// Prevent infinite loop if v is an interface pointing to its own address: // Prevent infinite loop if v is an interface pointing to its own address:
// var v any // var v any
// v = &v // v = &v
if v.Elem().Kind() == reflect.Interface && v.Elem().Elem() == v { if v.Elem().Kind() == reflect.Interface && v.Elem().Elem().Equal(v) {
v = v.Elem() v = v.Elem()
break break
} }

2
src/text/template/exec.go
View File

@ -810,7 +810,7 @@ func (s *state) evalCall(dot, fun reflect.Value, isBuiltin bool, node parse.Node
return v return v
} }
} }
if final != missingVal { if !final.Equal(missingVal) {
// The last argument to and/or is coming from // The last argument to and/or is coming from
// the pipeline. We didn't short circuit on an earlier // the pipeline. We didn't short circuit on an earlier
// argument, so we are going to return this one. // argument, so we are going to return this one.