hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-01 03:35:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

C++: fix bad join order in phi node sharing

Browse Source
This commit is contained in:
Robert Marsh
2021-05-03 11:49:12 -07:00
parent 5406783e9c
commit 35594eac22
3 changed files with 12 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll
View File

@@ -65,17 +65,10 @@ private module Cached {
instr = reusedPhiInstruction(_) and
// Check that the phi instruction is *not* degenerate, but we can't use
// getDegeneratePhiOperand in the first stage with phi instyructions
exists(
OldIR::PhiInputOperand operand1, OldIR::PhiInputOperand operand2,
OldInstruction oldInstruction
|
oldInstruction = instr and
operand1 = oldInstruction.(OldIR::PhiInstruction).getAnInputOperand() and
operand1.getPredecessorBlock() instanceof OldBlock and
operand2 = oldInstruction.(OldIR::PhiInstruction).getAnInputOperand() and
operand2.getPredecessorBlock() instanceof OldBlock and
operand1 != operand2
)
not exists(unique(OldIR::PhiInputOperand operand |
operand = instr.(OldIR::PhiInstruction).getAnInputOperand() and
operand.getPredecessorBlock() instanceof OldBlock
))
or
instr instanceof TChiInstruction
or

15
cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
View File

@@ -65,17 +65,10 @@ private module Cached {
instr = reusedPhiInstruction(_) and
// Check that the phi instruction is *not* degenerate, but we can't use
// getDegeneratePhiOperand in the first stage with phi instyructions
exists(
OldIR::PhiInputOperand operand1, OldIR::PhiInputOperand operand2,
OldInstruction oldInstruction
|
oldInstruction = instr and
operand1 = oldInstruction.(OldIR::PhiInstruction).getAnInputOperand() and
operand1.getPredecessorBlock() instanceof OldBlock and
operand2 = oldInstruction.(OldIR::PhiInstruction).getAnInputOperand() and
operand2.getPredecessorBlock() instanceof OldBlock and
operand1 != operand2
)
not exists(unique(OldIR::PhiInputOperand operand |
operand = instr.(OldIR::PhiInstruction).getAnInputOperand() and
operand.getPredecessorBlock() instanceof OldBlock
))
or
instr instanceof TChiInstruction
or