Skip to content

Commit 5dd8c9c

Browse files
author
Robert Marsh
committed
C++: revert InlineAsm subclassing SideEffectOpcode
1 parent 2770b2a commit 5dd8c9c

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

cpp/ql/src/semmle/code/cpp/ir/implementation/Opcode.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,6 @@ module Opcode {
215215
class BufferWriteSideEffect extends WriteSideEffectOpcode, BufferAccessOpcode, TBufferWriteSideEffect { override final string toString() { result = "BufferWriteSideEffect" } }
216216
class BufferMayWriteSideEffect extends MayWriteSideEffectOpcode, BufferAccessOpcode, TBufferMayWriteSideEffect { override final string toString() { result = "BufferMayWriteSideEffect" } }
217217
class Chi extends Opcode, TChi { override final string toString() { result = "Chi" } }
218-
class InlineAsm extends MayWriteSideEffectOpcode, TInlineAsm { override final string toString() { result = "InlineAsm" } }
218+
class InlineAsm extends Opcode, TInlineAsm { override final string toString() { result = "InlineAsm" } }
219219
class Unreached extends Opcode, TUnreached { override final string toString() { result = "Unreached" } }
220220
}

cpp/ql/test/library-tests/ir/ir/raw_ir.expected

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5006,7 +5006,7 @@ ir.cpp:
50065006
# 1099| mu0_2(unknown) = UnmodeledDefinition :
50075007
# 1099| r0_3(glval<int>) = VariableAddress[x] :
50085008
# 1099| mu0_4(int) = InitializeParameter[x] : &:r0_3
5009-
# 1100| mu0_5(unknown) = ^InlineAsm : ~mu0_2
5009+
# 1100| mu0_5(unknown) = InlineAsm : ~mu0_2
50105010
# 1101| r0_6(glval<int>) = VariableAddress[#return] :
50115011
# 1101| r0_7(glval<int>) = VariableAddress[x] :
50125012
# 1101| r0_8(int) = Load : &:r0_7, ~mu0_2
@@ -5033,7 +5033,7 @@ ir.cpp:
50335033
# 1106| r0_12(glval<unsigned int &>) = VariableAddress[b] :
50345034
# 1106| r0_13(glval<unsigned int &>) = VariableAddress[c] :
50355035
# 1106| r0_14(glval<unsigned int &>) = VariableAddress[d] :
5036-
# 1106| mu0_15(unknown) = ^InlineAsm : ~mu0_2, 0:r0_11, 1:r0_12, 2:r0_13, 3:r0_14
5036+
# 1106| mu0_15(unknown) = InlineAsm : ~mu0_2, 0:r0_11, 1:r0_12, 2:r0_13, 3:r0_14
50375037
# 1111| v0_16(void) = NoOp :
50385038
# 1104| v0_17(void) = ReturnVoid :
50395039
# 1104| v0_18(void) = UnmodeledUse : mu*

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ ssa.cpp:
719719
# 179| mu0_2(unknown) = UnmodeledDefinition :
720720
# 179| r0_3(glval<int *>) = VariableAddress[p] :
721721
# 179| m0_4(int *) = InitializeParameter[p] : &:r0_3
722-
# 180| m0_5(unknown) = ^InlineAsm : ~mu0_2
722+
# 180| m0_5(unknown) = InlineAsm : ~mu0_2
723723
# 180| m0_6(unknown) = Chi : total:m0_1, partial:m0_5
724724
# 181| r0_7(glval<int>) = VariableAddress[#return] :
725725
# 181| r0_8(glval<int *>) = VariableAddress[p] :
@@ -752,7 +752,7 @@ ssa.cpp:
752752
# 186| r0_16(glval<unsigned int &>) = VariableAddress[b] :
753753
# 186| r0_17(glval<unsigned int &>) = VariableAddress[c] :
754754
# 186| r0_18(glval<unsigned int &>) = VariableAddress[d] :
755-
# 186| m0_19(unknown) = ^InlineAsm : ~mu0_2, 0:r0_15, 1:r0_16, 2:r0_17, 3:r0_18
755+
# 186| m0_19(unknown) = InlineAsm : ~mu0_2, 0:r0_15, 1:r0_16, 2:r0_17, 3:r0_18
756756
# 186| m0_20(unknown) = Chi : total:m0_14, partial:m0_19
757757
# 192| v0_21(void) = NoOp :
758758
# 184| v0_22(void) = ReturnVoid :

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ ssa.cpp:
691691
# 179| mu0_2(unknown) = UnmodeledDefinition :
692692
# 179| r0_3(glval<int *>) = VariableAddress[p] :
693693
# 179| m0_4(int *) = InitializeParameter[p] : &:r0_3
694-
# 180| mu0_5(unknown) = ^InlineAsm : ~mu0_2
694+
# 180| mu0_5(unknown) = InlineAsm : ~mu0_2
695695
# 181| r0_6(glval<int>) = VariableAddress[#return] :
696696
# 181| r0_7(glval<int *>) = VariableAddress[p] :
697697
# 181| r0_8(int *) = Load : &:r0_7, m0_4
@@ -719,7 +719,7 @@ ssa.cpp:
719719
# 186| r0_12(glval<unsigned int &>) = VariableAddress[b] :
720720
# 186| r0_13(glval<unsigned int &>) = VariableAddress[c] :
721721
# 186| r0_14(glval<unsigned int &>) = VariableAddress[d] :
722-
# 186| mu0_15(unknown) = ^InlineAsm : ~mu0_2, 0:r0_11, 1:r0_12, 2:r0_13, 3:r0_14
722+
# 186| mu0_15(unknown) = InlineAsm : ~mu0_2, 0:r0_11, 1:r0_12, 2:r0_13, 3:r0_14
723723
# 192| v0_16(void) = NoOp :
724724
# 184| v0_17(void) = ReturnVoid :
725725
# 184| v0_18(void) = UnmodeledUse : mu*

0 commit comments

Comments
 (0)