C++: Fix IR generation and accept output

MathiasVP · MathiasVP · commit c5f38eecfee0 · 2020-02-20T15:37:02.000+01:00
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll
@@ -655,6 +655,10 @@ class TranslatedSwitchStmt extends TranslatedStmt {
       kind = getCaseEdge(switchCase) and
       result = getTranslatedStmt(switchCase).getFirstInstruction()
     )
+    or
+    not stmt.hasDefaultCase() and
+    kind instanceof GotoEdge and
+    result = getParent().getChildSuccessor(this)
   }
 
   override Instruction getChildSuccessor(TranslatedElement child) {
diff --git a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
@@ -6067,12 +6067,16 @@ ir.cpp:
 # 1175|     r1175_2(int)        = Load                   : &:r1175_1, ~mu1173_4
 # 1175|     v1175_3(void)       = Switch                 : r1175_2
 #-----|   Case[1] -> Block 1
+#-----|   Goto -> Block 2
 
 # 1176|   Block 1
 # 1176|     v1176_1(void)       = NoOp               : 
 # 1177|     r1177_1(int)        = Constant[2]        : 
 # 1177|     r1177_2(glval<int>) = VariableAddress[y] : 
 # 1177|     mu1177_3(int)       = Store              : &:r1177_2, r1177_1
+#-----|   Goto -> Block 2
+
+# 1179|   Block 2
 # 1179|     r1179_1(glval<int>) = VariableAddress[z] : 
 # 1179|     r1179_2(glval<int>) = VariableAddress[y] : 
 # 1179|     r1179_3(int)        = Load               : &:r1179_2, ~mu1173_4
@@ -6099,6 +6103,7 @@ ir.cpp:
 # 1184|     v1184_3(void)       = Switch                 : r1184_2
 #-----|   Case[1] -> Block 1
 #-----|   Case[2] -> Block 2
+#-----|   Goto -> Block 3
 
 # 1185|   Block 1
 # 1185|     v1185_1(void)       = NoOp               : 
@@ -6112,6 +6117,9 @@ ir.cpp:
 # 1188|     r1188_1(int)        = Constant[3]        : 
 # 1188|     r1188_2(glval<int>) = VariableAddress[y] : 
 # 1188|     mu1188_3(int)       = Store              : &:r1188_2, r1188_1
+#-----|   Goto -> Block 3
+
+# 1190|   Block 3
 # 1190|     r1190_1(glval<int>) = VariableAddress[z] : 
 # 1190|     r1190_2(glval<int>) = VariableAddress[y] : 
 # 1190|     r1190_3(int)        = Load               : &:r1190_2, ~mu1182_4
@@ -6138,6 +6146,7 @@ ir.cpp:
 # 1195|     v1195_3(void)       = Switch                 : r1195_2
 #-----|   Case[1] -> Block 1
 #-----|   Case[2] -> Block 2
+#-----|   Goto -> Block 3
 
 # 1196|   Block 1
 # 1196|     v1196_1(void)       = NoOp               : 

Original file line number	Diff line number	Diff line change
`@@ -655,6 +655,10 @@ class TranslatedSwitchStmt extends TranslatedStmt {`
`655`	`655`	`kind = getCaseEdge(switchCase) and`
`656`	`656`	`result = getTranslatedStmt(switchCase).getFirstInstruction()`
`657`	`657`	`)`
	`658`	`+ or`
	`659`	`+ not stmt.hasDefaultCase() and`
	`660`	`+ kind instanceof GotoEdge and`
	`661`	`+ result = getParent().getChildSuccessor(this)`
`658`	`662`	`}`
`659`	`663`
`660`	`664`	`override Instruction getChildSuccessor(TranslatedElement child) {`