Add logic to deal with reflect pkg changes on tip.
This commit adds logic to gracefully the internal reflect.Value flag bit changes as of golang commit adf9b30e5594 while maintaining support all the back to Go 1.0. It accomplishes this by adding code to the init time inspection to detect the change and set the flag positions accordingly. While here, also removes a TODO comment since it was already done previously.
This commit is contained in:
parent
2df174808e
commit
5215b55f46
|
@ -91,6 +91,21 @@ func init() {
|
||||||
flagKindShift = 0
|
flagKindShift = 0
|
||||||
flagRO = 1 << 5
|
flagRO = 1 << 5
|
||||||
flagIndir = 1 << 6
|
flagIndir = 1 << 6
|
||||||
|
|
||||||
|
// Commit adf9b30e5594 modified the flags to separate the
|
||||||
|
// flagRO flag into two bits which specifies whether or not the
|
||||||
|
// field is embedded. This causes flagIndir to move over a bit
|
||||||
|
// and means that flagRO is the combination of either of the
|
||||||
|
// original flagRO bit and the new bit.
|
||||||
|
//
|
||||||
|
// This code detects the change by extracting what used to be
|
||||||
|
// the indirect bit to ensure it's set. When it's not, the flag
|
||||||
|
// order has been changed to the newer format, so the flags are
|
||||||
|
// updated accordingly.
|
||||||
|
if upfv&flagIndir == 0 {
|
||||||
|
flagRO = 3 << 5
|
||||||
|
flagIndir = 1 << 7
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -181,8 +181,6 @@ func (d *dumpState) dumpSlice(v reflect.Value) {
|
||||||
// Try to use existing uint8 slices and fall back to converting
|
// Try to use existing uint8 slices and fall back to converting
|
||||||
// and copying if that fails.
|
// and copying if that fails.
|
||||||
case vt.Kind() == reflect.Uint8:
|
case vt.Kind() == reflect.Uint8:
|
||||||
// TODO(davec): Fix up the disableUnsafe bits...
|
|
||||||
|
|
||||||
// We need an addressable interface to convert the type
|
// We need an addressable interface to convert the type
|
||||||
// to a byte slice. However, the reflect package won't
|
// to a byte slice. However, the reflect package won't
|
||||||
// give us an interface on certain things like
|
// give us an interface on certain things like
|
||||||
|
|
Loading…
Reference in New Issue