diff options
author | Mike Pall <mike> | 2023-12-23 19:43:03 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2023-12-23 19:43:03 +0100 |
commit | 658530562c2ac7ffa8e4ca5d18856857471244e9 (patch) | |
tree | 531bb84b7d9215147f62579e65b056525bdd2219 | |
parent | 7dbe545933485849977d50384f2f20f2cccf0cf9 (diff) | |
download | luajit-658530562c2ac7ffa8e4ca5d18856857471244e9.tar.gz luajit-658530562c2ac7ffa8e4ca5d18856857471244e9.tar.bz2 luajit-658530562c2ac7ffa8e4ca5d18856857471244e9.zip |
Check for IR_HREF vs. IR_HREFK aliasing in non-nil store check.
Thanks to Peter Cawley. #1133
-rw-r--r-- | src/lj_ir.h | 1 | ||||
-rw-r--r-- | src/lj_opt_mem.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/lj_ir.h b/src/lj_ir.h index 9fd4e275..6d974ed2 100644 --- a/src/lj_ir.h +++ b/src/lj_ir.h | |||
@@ -346,6 +346,7 @@ typedef struct IRType1 { uint8_t irt; } IRType1; | |||
346 | #define irt_isu32(t) (irt_type(t) == IRT_U32) | 346 | #define irt_isu32(t) (irt_type(t) == IRT_U32) |
347 | #define irt_isi64(t) (irt_type(t) == IRT_I64) | 347 | #define irt_isi64(t) (irt_type(t) == IRT_I64) |
348 | #define irt_isu64(t) (irt_type(t) == IRT_U64) | 348 | #define irt_isu64(t) (irt_type(t) == IRT_U64) |
349 | #define irt_isp32(t) (irt_type(t) == IRT_P32) | ||
349 | 350 | ||
350 | #define irt_isfp(t) (irt_isnum(t) || irt_isfloat(t)) | 351 | #define irt_isfp(t) (irt_isnum(t) || irt_isfloat(t)) |
351 | #define irt_isinteger(t) (irt_typerange((t), IRT_I8, IRT_INT)) | 352 | #define irt_isinteger(t) (irt_typerange((t), IRT_I8, IRT_INT)) |
diff --git a/src/lj_opt_mem.c b/src/lj_opt_mem.c index 04b95a6f..214fb632 100644 --- a/src/lj_opt_mem.c +++ b/src/lj_opt_mem.c | |||
@@ -879,6 +879,8 @@ int lj_opt_fwd_wasnonnil(jit_State *J, IROpT loadop, IRRef xref) | |||
879 | if (skref == xkref || !irref_isk(skref) || !irref_isk(xkref)) | 879 | if (skref == xkref || !irref_isk(skref) || !irref_isk(xkref)) |
880 | return 0; /* A nil store with same const key or var key MAY alias. */ | 880 | return 0; /* A nil store with same const key or var key MAY alias. */ |
881 | /* Different const keys CANNOT alias. */ | 881 | /* Different const keys CANNOT alias. */ |
882 | } else if (irt_isp32(IR(skref)->t) != irt_isp32(IR(xkref)->t)) { | ||
883 | return 0; /* HREF and HREFK MAY alias. */ | ||
882 | } /* Different key types CANNOT alias. */ | 884 | } /* Different key types CANNOT alias. */ |
883 | } /* Other non-nil stores MAY alias. */ | 885 | } /* Other non-nil stores MAY alias. */ |
884 | ref = store->prev; | 886 | ref = store->prev; |