Skip to content

Commit 22e34d8

Browse files
committed
[MERGE #5198 @MikeHolman] fix bad merge that removed branch from lower
Merge pull request #5198 from MikeHolman:fixmerge Security fix was supposed to move the branch, but it got removed during merge
2 parents a3d2f0e + 3f0ecef commit 22e34d8

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

lib/Backend/Lower.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15733,6 +15733,8 @@ Lowerer::GeneratePropertyStringTest(IR::RegOpnd *srcReg, IR::Instr *instrInsert,
1573315733

1573415734
InsertObjectPoison(srcReg, branchInstr, instrInsert, !usePoison);
1573515735

15736+
InsertBranch(Js::OpCode::Br, propStrLoadedLabel, instrInsert);
15737+
1573615738
instrInsert->InsertBefore(notPropStrLabel);
1573715739

1573815740
branchInstr = InsertCompareBranch(

0 commit comments

Comments
 (0)