hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-22 11:46:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

C++: simplify getDisplayOrderInBlock

Browse Source
This commit is contained in:
Robert Marsh
2019-11-26 16:02:30 -05:00
parent 60b384a6e5
commit e368d5dda0
7 changed files with 84 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll
View File

@@ -9,7 +9,6 @@ import Imports::IRType
import Imports::MemoryAccessKind import Imports::MemoryAccessKind
import Imports::Opcode import Imports::Opcode
private import Imports::OperandTag private import Imports::OperandTag
import semmle.code.cpp.ir.implementation.internal.PrintSupport
module InstructionSanity { module InstructionSanity {
/** /**
@@ -351,28 +350,23 @@ class Instruction extends Construction::TInstruction {
*/ */
int getDisplayIndexInBlock() { int getDisplayIndexInBlock() {
exists(IRBlock block | exists(IRBlock block |
block = getBlock() and this = block.getInstruction(result)
( or
exists(int index, int phiCount | this = rank[-result - 1](PhiInstruction phiInstr |
phiCount = count(block.getAPhiInstruction()) and phiInstr = block.getAPhiInstruction()
this = block.getInstruction(index) and |
result = index + phiCount phiInstr order by phiInstr.getUniqueId()
) )
or
this instanceof PhiInstruction and
this = rank[result + 1](PhiInstruction phiInstr |
phiInstr = block.getAPhiInstruction()
|
phiInstr order by phiInstr.getUniqueId()
)
)
) )
} }
int getLineRank() { int getLineRank() {
this = rank[result](Instruction instr | instr.getAST().getFile() = getAST().getFile() and instr.getAST().getLocation().getStartLine() = getAST().getLocation().getStartLine() | instr this = rank[result](Instruction instr |
order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock() instr.getAST().getFile() = getAST().getFile() and
) instr.getAST().getLocation().getStartLine() = getAST().getLocation().getStartLine()
|
instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()
)
} }
/** /**

30
cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Instruction.qll
View File

@@ -9,7 +9,6 @@ import Imports::IRType
import Imports::MemoryAccessKind import Imports::MemoryAccessKind
import Imports::Opcode import Imports::Opcode
private import Imports::OperandTag private import Imports::OperandTag
import semmle.code.cpp.ir.implementation.internal.PrintSupport
module InstructionSanity { module InstructionSanity {
/** /**
@@ -351,28 +350,23 @@ class Instruction extends Construction::TInstruction {
*/ */
int getDisplayIndexInBlock() { int getDisplayIndexInBlock() {
exists(IRBlock block | exists(IRBlock block |
block = getBlock() and this = block.getInstruction(result)
( or
exists(int index, int phiCount | this = rank[-result - 1](PhiInstruction phiInstr |
phiCount = count(block.getAPhiInstruction()) and phiInstr = block.getAPhiInstruction()
this = block.getInstruction(index) and |
result = index + phiCount phiInstr order by phiInstr.getUniqueId()
) )
or
this instanceof PhiInstruction and
this = rank[result + 1](PhiInstruction phiInstr |
phiInstr = block.getAPhiInstruction()
|
phiInstr order by phiInstr.getUniqueId()
)
)
) )
} }
int getLineRank() { int getLineRank() {
this = rank[result](Instruction instr | instr.getAST().getFile() = getAST().getFile() and instr.getAST().getLocation().getStartLine() = getAST().getLocation().getStartLine() | instr this = rank[result](Instruction instr |
order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock() instr.getAST().getFile() = getAST().getFile() and
) instr.getAST().getLocation().getStartLine() = getAST().getLocation().getStartLine()
|
instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()
)
} }
/** /**

30
cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll
View File

@@ -9,7 +9,6 @@ import Imports::IRType
import Imports::MemoryAccessKind import Imports::MemoryAccessKind
import Imports::Opcode import Imports::Opcode
private import Imports::OperandTag private import Imports::OperandTag
import semmle.code.cpp.ir.implementation.internal.PrintSupport
module InstructionSanity { module InstructionSanity {
/** /**
@@ -351,28 +350,23 @@ class Instruction extends Construction::TInstruction {
*/ */
int getDisplayIndexInBlock() { int getDisplayIndexInBlock() {
exists(IRBlock block | exists(IRBlock block |
block = getBlock() and this = block.getInstruction(result)
( or
exists(int index, int phiCount | this = rank[-result - 1](PhiInstruction phiInstr |
phiCount = count(block.getAPhiInstruction()) and phiInstr = block.getAPhiInstruction()
this = block.getInstruction(index) and |
result = index + phiCount phiInstr order by phiInstr.getUniqueId()
) )
or
this instanceof PhiInstruction and
this = rank[result + 1](PhiInstruction phiInstr |
phiInstr = block.getAPhiInstruction()
|
phiInstr order by phiInstr.getUniqueId()
)
)
) )
} }
int getLineRank() { int getLineRank() {
this = rank[result](Instruction instr | instr.getAST().getFile() = getAST().getFile() and instr.getAST().getLocation().getStartLine() = getAST().getLocation().getStartLine() | instr this = rank[result](Instruction instr |
order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock() instr.getAST().getFile() = getAST().getFile() and
) instr.getAST().getLocation().getStartLine() = getAST().getLocation().getStartLine()
|
instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()
)
} }
/** /**

32
cpp/ql/test/library-tests/ir/ssa/aliased_ssa_ir.expected
View File

@@ -211,26 +211,26 @@ ssa.cpp:
# 70| Block 1 # 70| Block 1
# 70| r70_1(char) = Constant[0] : # 70| r70_1(char) = Constant[0] :
# 70| r70_2(glval<char *>) = VariableAddress[p] : # 70| r70_2(glval<char *>) = VariableAddress[p] :
# 70| r70_3(char *) = Load : &:r70_2, m69_3 # 70| r70_3(char *) = Load : &:r70_2, m69_1
# 70| r70_4(int) = Constant[1] : # 70| r70_4(int) = Constant[1] :
# 70| r70_5(char *) = PointerAdd[1] : r70_3, r70_4 # 70| r70_5(char *) = PointerAdd[1] : r70_3, r70_4
# 70| m70_6(char *) = Store : &:r70_2, r70_5 # 70| m70_6(char *) = Store : &:r70_2, r70_5
# 70| r70_7(glval<char>) = CopyValue : r70_3 # 70| r70_7(glval<char>) = CopyValue : r70_3
# 70| m70_8(char) = Store : &:r70_7, r70_1 # 70| m70_8(char) = Store : &:r70_7, r70_1
# 70| m70_9(unknown) = Chi : total:m69_1, partial:m70_8 # 70| m70_9(unknown) = Chi : total:m69_3, partial:m70_8
#-----| Goto (back edge) -> Block 3 #-----| Goto (back edge) -> Block 3
# 71| Block 2 # 71| Block 2
# 71| v71_1(void) = NoOp : # 71| v71_1(void) = NoOp :
# 68| v68_8(void) = ReturnVoid : # 68| v68_8(void) = ReturnVoid :
# 68| v68_9(void) = UnmodeledUse : mu* # 68| v68_9(void) = UnmodeledUse : mu*
# 68| v68_10(void) = AliasedUse : ~m69_1 # 68| v68_10(void) = AliasedUse : ~m69_3
# 68| v68_11(void) = ExitFunction : # 68| v68_11(void) = ExitFunction :
# 69| Block 3 # 69| Block 3
# 69| m69_1(unknown) = Phi : from 0:~m68_2, from 1:~m70_9 # 69| m69_1(char *) = Phi : from 0:m68_7, from 1:m70_6
# 69| m69_2(int) = Phi : from 0:m68_5, from 1:m69_8 # 69| m69_2(int) = Phi : from 0:m68_5, from 1:m69_8
# 69| m69_3(char *) = Phi : from 0:m68_7, from 1:m70_6 # 69| m69_3(unknown) = Phi : from 0:~m68_2, from 1:~m70_9
# 69| r69_4(glval<int>) = VariableAddress[n] : # 69| r69_4(glval<int>) = VariableAddress[n] :
# 69| r69_5(int) = Load : &:r69_4, m69_2 # 69| r69_5(int) = Load : &:r69_4, m69_2
# 69| r69_6(int) = Constant[1] : # 69| r69_6(int) = Constant[1] :
@@ -280,15 +280,15 @@ ssa.cpp:
#-----| Goto -> Block 3 #-----| Goto -> Block 3
# 86| Block 3 # 86| Block 3
# 86| m86_1(int) = Phi : from 1:m80_3, from 2:m84_3 # 86| m86_1(int) = Phi : from 1:m81_3, from 2:m77_3
# 86| m86_2(int) = Phi : from 1:m81_3, from 2:m77_3 # 86| m86_2(int) = Phi : from 1:m80_3, from 2:m84_3
# 86| r86_3(glval<int>) = VariableAddress[x_merge] : # 86| r86_3(glval<int>) = VariableAddress[x_merge] :
# 86| r86_4(glval<int>) = VariableAddress[x] : # 86| r86_4(glval<int>) = VariableAddress[x] :
# 86| r86_5(int) = Load : &:r86_4, m86_1 # 86| r86_5(int) = Load : &:r86_4, m86_2
# 86| m86_6(int) = Store : &:r86_3, r86_5 # 86| m86_6(int) = Store : &:r86_3, r86_5
# 87| r87_1(glval<int>) = VariableAddress[y_merge] : # 87| r87_1(glval<int>) = VariableAddress[y_merge] :
# 87| r87_2(glval<int>) = VariableAddress[y] : # 87| r87_2(glval<int>) = VariableAddress[y] :
# 87| r87_3(int) = Load : &:r87_2, m86_2 # 87| r87_3(int) = Load : &:r87_2, m86_1
# 87| m87_4(int) = Store : &:r87_1, r87_3 # 87| m87_4(int) = Store : &:r87_1, r87_3
# 88| r88_1(glval<int>) = VariableAddress[z_merge] : # 88| r88_1(glval<int>) = VariableAddress[z_merge] :
# 88| r88_2(glval<int>) = VariableAddress[z] : # 88| r88_2(glval<int>) = VariableAddress[z] :
@@ -521,16 +521,16 @@ ssa.cpp:
#-----| Goto -> Block 3 #-----| Goto -> Block 3
# 130| Block 3 # 130| Block 3
# 130| m130_1(Point) = Phi : from 1:~m125_6, from 2:~m128_6 # 130| m130_1(int) = Phi : from 1:m125_5, from 2:m128_5
# 130| m130_2(int) = Phi : from 1:m125_5, from 2:m128_5 # 130| m130_2(Point) = Phi : from 1:~m125_6, from 2:~m128_6
# 130| r130_3(glval<int>) = VariableAddress[x] : # 130| r130_3(glval<int>) = VariableAddress[x] :
# 130| r130_4(glval<Point>) = VariableAddress[a] : # 130| r130_4(glval<Point>) = VariableAddress[a] :
# 130| r130_5(glval<int>) = FieldAddress[x] : r130_4 # 130| r130_5(glval<int>) = FieldAddress[x] : r130_4
# 130| r130_6(int) = Load : &:r130_5, m130_2 # 130| r130_6(int) = Load : &:r130_5, m130_1
# 130| m130_7(int) = Store : &:r130_3, r130_6 # 130| m130_7(int) = Store : &:r130_3, r130_6
# 131| r131_1(glval<Point>) = VariableAddress[b] : # 131| r131_1(glval<Point>) = VariableAddress[b] :
# 131| r131_2(glval<Point>) = VariableAddress[a] : # 131| r131_2(glval<Point>) = VariableAddress[a] :
# 131| r131_3(Point) = Load : &:r131_2, m130_1 # 131| r131_3(Point) = Load : &:r131_2, m130_2
# 131| m131_4(Point) = Store : &:r131_1, r131_3 # 131| m131_4(Point) = Store : &:r131_1, r131_3
# 132| v132_1(void) = NoOp : # 132| v132_1(void) = NoOp :
# 122| v122_10(void) = ReturnVoid : # 122| v122_10(void) = ReturnVoid :
@@ -582,12 +582,12 @@ ssa.cpp:
#-----| Goto -> Block 3 #-----| Goto -> Block 3
# 142| Block 3 # 142| Block 3
# 142| m142_1(Point) = Phi : from 1:~m137_6, from 2:m140_4 # 142| m142_1(int) = Phi : from 1:m137_5, from 2:~m140_4
# 142| m142_2(int) = Phi : from 1:m137_5, from 2:~m140_4 # 142| m142_2(Point) = Phi : from 1:~m137_6, from 2:m140_4
# 142| r142_3(glval<int>) = VariableAddress[x] : # 142| r142_3(glval<int>) = VariableAddress[x] :
# 142| r142_4(glval<Point>) = VariableAddress[a] : # 142| r142_4(glval<Point>) = VariableAddress[a] :
# 142| r142_5(glval<int>) = FieldAddress[x] : r142_4 # 142| r142_5(glval<int>) = FieldAddress[x] : r142_4
# 142| r142_6(int) = Load : &:r142_5, m142_2 # 142| r142_6(int) = Load : &:r142_5, m142_1
# 142| m142_7(int) = Store : &:r142_3, r142_6 # 142| m142_7(int) = Store : &:r142_3, r142_6
# 143| v143_1(void) = NoOp : # 143| v143_1(void) = NoOp :
# 134| v134_10(void) = ReturnVoid : # 134| v134_10(void) = ReturnVoid :

16
cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_ir.expected
View File

@@ -214,7 +214,7 @@ ssa.cpp:
# 70| Block 1 # 70| Block 1
# 70| r70_1(char) = Constant[0] : # 70| r70_1(char) = Constant[0] :
# 70| r70_2(glval<char *>) = VariableAddress[p] : # 70| r70_2(glval<char *>) = VariableAddress[p] :
# 70| r70_3(char *) = Load : &:r70_2, m69_2 # 70| r70_3(char *) = Load : &:r70_2, m69_1
# 70| r70_4(int) = Constant[1] : # 70| r70_4(int) = Constant[1] :
# 70| r70_5(char *) = PointerAdd[1] : r70_3, r70_4 # 70| r70_5(char *) = PointerAdd[1] : r70_3, r70_4
# 70| m70_6(char *) = Store : &:r70_2, r70_5 # 70| m70_6(char *) = Store : &:r70_2, r70_5
@@ -230,10 +230,10 @@ ssa.cpp:
# 68| v68_11(void) = ExitFunction : # 68| v68_11(void) = ExitFunction :
# 69| Block 3 # 69| Block 3
# 69| m69_1(int) = Phi : from 0:m68_5, from 1:m69_7 # 69| m69_1(char *) = Phi : from 0:m68_7, from 1:m70_6
# 69| m69_2(char *) = Phi : from 0:m68_7, from 1:m70_6 # 69| m69_2(int) = Phi : from 0:m68_5, from 1:m69_7
# 69| r69_3(glval<int>) = VariableAddress[n] : # 69| r69_3(glval<int>) = VariableAddress[n] :
# 69| r69_4(int) = Load : &:r69_3, m69_1 # 69| r69_4(int) = Load : &:r69_3, m69_2
# 69| r69_5(int) = Constant[1] : # 69| r69_5(int) = Constant[1] :
# 69| r69_6(int) = Sub : r69_4, r69_5 # 69| r69_6(int) = Sub : r69_4, r69_5
# 69| m69_7(int) = Store : &:r69_3, r69_6 # 69| m69_7(int) = Store : &:r69_3, r69_6
@@ -281,15 +281,15 @@ ssa.cpp:
#-----| Goto -> Block 3 #-----| Goto -> Block 3
# 86| Block 3 # 86| Block 3
# 86| m86_1(int) = Phi : from 1:m80_3, from 2:m84_3 # 86| m86_1(int) = Phi : from 1:m81_3, from 2:m77_3
# 86| m86_2(int) = Phi : from 1:m81_3, from 2:m77_3 # 86| m86_2(int) = Phi : from 1:m80_3, from 2:m84_3
# 86| r86_3(glval<int>) = VariableAddress[x_merge] : # 86| r86_3(glval<int>) = VariableAddress[x_merge] :
# 86| r86_4(glval<int>) = VariableAddress[x] : # 86| r86_4(glval<int>) = VariableAddress[x] :
# 86| r86_5(int) = Load : &:r86_4, m86_1 # 86| r86_5(int) = Load : &:r86_4, m86_2
# 86| m86_6(int) = Store : &:r86_3, r86_5 # 86| m86_6(int) = Store : &:r86_3, r86_5
# 87| r87_1(glval<int>) = VariableAddress[y_merge] : # 87| r87_1(glval<int>) = VariableAddress[y_merge] :
# 87| r87_2(glval<int>) = VariableAddress[y] : # 87| r87_2(glval<int>) = VariableAddress[y] :
# 87| r87_3(int) = Load : &:r87_2, m86_2 # 87| r87_3(int) = Load : &:r87_2, m86_1
# 87| m87_4(int) = Store : &:r87_1, r87_3 # 87| m87_4(int) = Store : &:r87_1, r87_3
# 88| r88_1(glval<int>) = VariableAddress[z_merge] : # 88| r88_1(glval<int>) = VariableAddress[z_merge] :
# 88| r88_2(glval<int>) = VariableAddress[z] : # 88| r88_2(glval<int>) = VariableAddress[z] :

30
csharp/ql/src/semmle/code/csharp/ir/implementation/raw/Instruction.qll
View File

@@ -9,7 +9,6 @@ import Imports::IRType
import Imports::MemoryAccessKind import Imports::MemoryAccessKind
import Imports::Opcode import Imports::Opcode
private import Imports::OperandTag private import Imports::OperandTag
import semmle.code.cpp.ir.implementation.internal.PrintSupport
module InstructionSanity { module InstructionSanity {
/** /**
@@ -351,28 +350,23 @@ class Instruction extends Construction::TInstruction {
*/ */
int getDisplayIndexInBlock() { int getDisplayIndexInBlock() {
exists(IRBlock block | exists(IRBlock block |
block = getBlock() and this = block.getInstruction(result)
( or
exists(int index, int phiCount | this = rank[-result - 1](PhiInstruction phiInstr |
phiCount = count(block.getAPhiInstruction()) and phiInstr = block.getAPhiInstruction()
this = block.getInstruction(index) and |
result = index + phiCount phiInstr order by phiInstr.getUniqueId()
) )
or
this instanceof PhiInstruction and
this = rank[result + 1](PhiInstruction phiInstr |
phiInstr = block.getAPhiInstruction()
|
phiInstr order by phiInstr.getUniqueId()
)
)
) )
} }
int getLineRank() { int getLineRank() {
this = rank[result](Instruction instr | instr.getAST().getFile() = getAST().getFile() and instr.getAST().getLocation().getStartLine() = getAST().getLocation().getStartLine() | instr this = rank[result](Instruction instr |
order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock() instr.getAST().getFile() = getAST().getFile() and
) instr.getAST().getLocation().getStartLine() = getAST().getLocation().getStartLine()
|
instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()
)
} }
/** /**

30
csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/Instruction.qll
View File

@@ -9,7 +9,6 @@ import Imports::IRType
import Imports::MemoryAccessKind import Imports::MemoryAccessKind
import Imports::Opcode import Imports::Opcode
private import Imports::OperandTag private import Imports::OperandTag
import semmle.code.cpp.ir.implementation.internal.PrintSupport
module InstructionSanity { module InstructionSanity {
/** /**
@@ -351,28 +350,23 @@ class Instruction extends Construction::TInstruction {
*/ */
int getDisplayIndexInBlock() { int getDisplayIndexInBlock() {
exists(IRBlock block | exists(IRBlock block |
block = getBlock() and this = block.getInstruction(result)
( or
exists(int index, int phiCount | this = rank[-result - 1](PhiInstruction phiInstr |
phiCount = count(block.getAPhiInstruction()) and phiInstr = block.getAPhiInstruction()
this = block.getInstruction(index) and |
result = index + phiCount phiInstr order by phiInstr.getUniqueId()
) )
or
this instanceof PhiInstruction and
this = rank[result + 1](PhiInstruction phiInstr |
phiInstr = block.getAPhiInstruction()
|
phiInstr order by phiInstr.getUniqueId()
)
)
) )
} }
int getLineRank() { int getLineRank() {
this = rank[result](Instruction instr | instr.getAST().getFile() = getAST().getFile() and instr.getAST().getLocation().getStartLine() = getAST().getLocation().getStartLine() | instr this = rank[result](Instruction instr |
order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock() instr.getAST().getFile() = getAST().getFile() and
) instr.getAST().getLocation().getStartLine() = getAST().getLocation().getStartLine()
|
instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()
)
} }
/** /**