Skip to content

Fix MSVC shift warnings in IR vector bounds checks #23993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
realFlowControl wants to merge 1 commit into from
Closed

Fix MSVC shift warnings in IR vector bounds checks #23993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .github/scripts/download-bundled/jit-ir.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/ext/opcache/jit/ir/ir_fold.h b/ext/opcache/jit/ir/ir_fold.h
index c5fd2f28894..fae3b4b4655 100644
--- a/ext/opcache/jit/ir/ir_fold.h
+++ b/ext/opcache/jit/ir/ir_fold.h
@@ -1841,7 +1841,7 @@ IR_FOLD(REPLACE(LONG_CONST, _))
&& IR_IS_CONST_REF(op2)
&& IR_IS_TYPE_INT(op2_insn->type)
&& op2_insn->val.i64 >= 0
- && op2_insn->val.i64 < IR_VECTOR_LENGTH(op1_insn->type)) {
+ && op2_insn->val.i64 < (int64_t)IR_VECTOR_LENGTH(op1_insn->type)) {
IR_ASSERT(IR_IS_TYPE_VECTOR(op1_insn->type)
&& (IR_VECTOR_BASE_TYPE(op1_insn->type) == op3_insn->type
|| (IR_IS_TYPE_INT(IR_VECTOR_BASE_TYPE(op1_insn->type))
@@ -1943,7 +1943,7 @@ IR_FOLD(EXTRACT(LONG_CONST, _))
if (IR_IS_CONST_REF(op2)
&& IR_IS_TYPE_INT(op2_insn->type)
&& op2_insn->val.i64 >= 0
- && op2_insn->val.i64 < IR_VECTOR_LENGTH(op1_insn->type)) {
+ && op2_insn->val.i64 < (int64_t)IR_VECTOR_LENGTH(op1_insn->type)) {
uint32_t idx = op2_insn->val.u32;
void *ptr;

3 changes: 3 additions & 0 deletions .github/scripts/download-bundled/jit-ir.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,6 @@ rm ir_mem2ssa.c

# add extra files
git restore README

# patch customized files
git apply -v ../../../../.github/scripts/download-bundled/jit-ir.patch
4 changes: 2 additions & 2 deletions ext/opcache/jit/ir/ir_fold.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1841,7 +1841,7 @@ IR_FOLD(REPLACE(LONG_CONST, _))
&& IR_IS_CONST_REF(op2)
&& IR_IS_TYPE_INT(op2_insn->type)
&& op2_insn->val.i64 >= 0
&& op2_insn->val.i64 < IR_VECTOR_LENGTH(op1_insn->type)) {
&& op2_insn->val.i64 < (int64_t)IR_VECTOR_LENGTH(op1_insn->type)) {
IR_ASSERT(IR_IS_TYPE_VECTOR(op1_insn->type)
&& (IR_VECTOR_BASE_TYPE(op1_insn->type) == op3_insn->type
|| (IR_IS_TYPE_INT(IR_VECTOR_BASE_TYPE(op1_insn->type))
Expand Down Expand Up @@ -1943,7 +1943,7 @@ IR_FOLD(EXTRACT(LONG_CONST, _))
if (IR_IS_CONST_REF(op2)
&& IR_IS_TYPE_INT(op2_insn->type)
&& op2_insn->val.i64 >= 0
&& op2_insn->val.i64 < IR_VECTOR_LENGTH(op1_insn->type)) {
&& op2_insn->val.i64 < (int64_t)IR_VECTOR_LENGTH(op1_insn->type)) {
uint32_t idx = op2_insn->val.u32;
void *ptr;

Expand Down
Loading