summaryrefslogtreecommitdiffstats
path: root/generic/tclIndexObj.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-04-26 15:41:42 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-04-26 15:41:42 (GMT)
commit208f8c30a1c20162f7ec27c09afb7818153f254d (patch)
treeafd9f2d53d123c144ea98524e210756e8082226c /generic/tclIndexObj.c
parenta69bdcf1eea657ee8dfe8cba2071b0ed269531ea (diff)
parent9f54abf33a1289128b25b82e8a2d53013463801e (diff)
downloadtcl-208f8c30a1c20162f7ec27c09afb7818153f254d.zip
tcl-208f8c30a1c20162f7ec27c09afb7818153f254d.tar.gz
tcl-208f8c30a1c20162f7ec27c09afb7818153f254d.tar.bz2
Merge 8.7
Diffstat (limited to 'generic/tclIndexObj.c')
-rw-r--r--generic/tclIndexObj.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c
index c369827..567bdc5 100644
--- a/generic/tclIndexObj.c
+++ b/generic/tclIndexObj.c
@@ -300,20 +300,21 @@ Tcl_GetIndexFromObjStruct(
uncachedDone:
if (indexPtr != NULL) {
- if ((flags>>8) & (int)~sizeof(int)) {
- if ((flags>>8) == sizeof(uint64_t)) {
- *(uint64_t *)indexPtr = index;
- return TCL_OK;
- } else if ((flags>>8) == sizeof(uint32_t)) {
- *(uint32_t *)indexPtr = index;
- return TCL_OK;
- } else if ((flags>>8) == sizeof(uint16_t)) {
+ flags &= (30-(int)(sizeof(int)<<1));
+ if (flags) {
+ if (flags == sizeof(uint16_t)<<1) {
*(uint16_t *)indexPtr = index;
return TCL_OK;
- } else if ((flags>>8) == sizeof(uint8_t)) {
+ } else if (flags == (int)(sizeof(uint8_t)<<1)) {
*(uint8_t *)indexPtr = index;
return TCL_OK;
- }
+ } else if (flags == (int)(sizeof(int64_t)<<1)) {
+ *(int64_t *)indexPtr = index;
+ return TCL_OK;
+ } else if (flags == (int)(sizeof(int32_t)<<1)) {
+ *(int32_t *)indexPtr = index;
+ return TCL_OK;
+ }
}
*(int *)indexPtr = index;
}