Merge pull request #15741 from MathiasVP/fix-ir-inconsistencies-from-returning-routine-types

C++: Fix IR inconsistencies from routine types

Author: MathiasVP

cpp/ql/lib/semmle/code/cpp/ir/internal/CppType.qll

@@ -11,7 +11,7 @@ private int getTypeSizeWorkaround(Type type) {
   exists(Type unspecifiedType |
     unspecifiedType = type.getUnspecifiedType() and
     (
-      unspecifiedType instanceof FunctionReferenceType and
+      (unspecifiedType instanceof FunctionReferenceType or unspecifiedType instanceof RoutineType) and
       result = getPointerSize()
       or
       exists(PointerToMemberType ptmType |
@@ -176,7 +176,7 @@ private IRType getIRTypeForPRValue(Type type) {
     isPointerIshType(unspecifiedType) and
     result.(IRAddressType).getByteSize() = getTypeSize(unspecifiedType)
     or
-    unspecifiedType instanceof FunctionPointerIshType and
+    (unspecifiedType instanceof FunctionPointerIshType or unspecifiedType instanceof RoutineType) and
     result.(IRFunctionAddressType).getByteSize() = getTypeSize(type)
     or
     unspecifiedType instanceof VoidType and result instanceof IRVoidType

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

@@ -18076,6 +18076,25 @@ ir.cpp:
 # 2317|         getQualifier(): [VariableAccess] s
 # 2317|             Type = [Struct] String
 # 2317|             ValueCategory = lvalue
+# 2320| [CopyAssignmentOperator] return_routine_type::HasVoidToIntFunc& return_routine_type::HasVoidToIntFunc::operator=(return_routine_type::HasVoidToIntFunc const&)
+# 2320|   <params>: 
+#-----|     getParameter(0): [Parameter] (unnamed parameter 0)
+#-----|         Type = [LValueReferenceType] const HasVoidToIntFunc &
+# 2320| [MoveAssignmentOperator] return_routine_type::HasVoidToIntFunc& return_routine_type::HasVoidToIntFunc::operator=(return_routine_type::HasVoidToIntFunc&&)
+# 2320|   <params>: 
+#-----|     getParameter(0): [Parameter] (unnamed parameter 0)
+#-----|         Type = [RValueReferenceType] HasVoidToIntFunc &&
+# 2322| [MemberFunction] void return_routine_type::HasVoidToIntFunc::VoidToInt(int)
+# 2322|   <params>: 
+# 2322|     getParameter(0): [Parameter] (unnamed parameter 0)
+# 2322|         Type = [IntType] int
+# 2327| [TopLevelFunction] return_routine_type::VoidToIntMemberFunc return_routine_type::GetVoidToIntFunc()
+# 2327|   <params>: 
+# 2328|   getEntryPoint(): [BlockStmt] { ... }
+# 2329|     getStmt(0): [ReturnStmt] return ...
+# 2329|       getExpr(): [FunctionAccess] VoidToInt
+# 2329|           Type = [RoutineType] ..()(..)
+# 2329|           ValueCategory = prvalue
 perf-regression.cpp:
 #    4| [CopyAssignmentOperator] Big& Big::operator=(Big const&)
 #    4|   <params>: 

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

@@ -14579,6 +14579,20 @@ ir.cpp:
 # 2314|     v2314_6(void)           = AliasedUse                      : ~m2317_5
 # 2314|     v2314_7(void)           = ExitFunction                    : 
 
+# 2327| return_routine_type::VoidToIntMemberFunc return_routine_type::GetVoidToIntFunc()
+# 2327|   Block 0
+# 2327|     v2327_1(void)          = EnterFunction              : 
+# 2327|     m2327_2(unknown)       = AliasedDefinition          : 
+# 2327|     m2327_3(unknown)       = InitializeNonLocal         : 
+# 2327|     m2327_4(unknown)       = Chi                        : total:m2327_2, partial:m2327_3
+# 2329|     r2329_1(glval<..:: *>) = VariableAddress[#return]   : 
+# 2329|     r2329_2(..()(..))      = FunctionAddress[VoidToInt] : 
+# 2329|     m2329_3(..:: *)        = Store[#return]             : &:r2329_1, r2329_2
+# 2327|     r2327_5(glval<..:: *>) = VariableAddress[#return]   : 
+# 2327|     v2327_6(void)          = ReturnValue                : &:r2327_5, m2329_3
+# 2327|     v2327_7(void)          = AliasedUse                 : m2327_3
+# 2327|     v2327_8(void)          = ExitFunction               : 
+
 perf-regression.cpp:
 #    6| void Big::Big()
 #    6|   Block 0

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

@@ -2316,4 +2316,19 @@ void VoidReturnDestructors() {
     return VoidFunc();
 }
 
+namespace return_routine_type {
+    struct HasVoidToIntFunc
+    {
+        void VoidToInt(int);
+    };
+
+    typedef void (HasVoidToIntFunc::*VoidToIntMemberFunc)(int);
+
+    static VoidToIntMemberFunc GetVoidToIntFunc()
+    {
+        return &HasVoidToIntFunc::VoidToInt;
+    }
+
+}
+
 // semmle-extractor-options: -std=c++20 --clang

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

@@ -12029,6 +12029,13 @@
 | ir.cpp:2317:1:2317:1 | ChiTotal | total:m2316_4 |
 | ir.cpp:2317:1:2317:1 | SideEffect | m2315_8 |
 | ir.cpp:2317:1:2317:1 | SideEffect | ~m2316_4 |
+| ir.cpp:2327:32:2327:47 | Address | &:r2327_5 |
+| ir.cpp:2327:32:2327:47 | ChiPartial | partial:m2327_3 |
+| ir.cpp:2327:32:2327:47 | ChiTotal | total:m2327_2 |
+| ir.cpp:2327:32:2327:47 | Load | m2329_3 |
+| ir.cpp:2327:32:2327:47 | SideEffect | m2327_3 |
+| ir.cpp:2329:9:2329:44 | Address | &:r2329_1 |
+| ir.cpp:2329:16:2329:43 | StoreValue | r2329_2 |
 | perf-regression.cpp:6:3:6:5 | Address | &:r6_5 |
 | perf-regression.cpp:6:3:6:5 | Address | &:r6_5 |
 | perf-regression.cpp:6:3:6:5 | Address | &:r6_7 |

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

@@ -13510,6 +13510,19 @@ ir.cpp:
 # 2314|     v2314_5(void)           = AliasedUse                      : ~m?
 # 2314|     v2314_6(void)           = ExitFunction                    : 
 
+# 2327| return_routine_type::VoidToIntMemberFunc return_routine_type::GetVoidToIntFunc()
+# 2327|   Block 0
+# 2327|     v2327_1(void)          = EnterFunction              : 
+# 2327|     mu2327_2(unknown)      = AliasedDefinition          : 
+# 2327|     mu2327_3(unknown)      = InitializeNonLocal         : 
+# 2329|     r2329_1(glval<..:: *>) = VariableAddress[#return]   : 
+# 2329|     r2329_2(..()(..))      = FunctionAddress[VoidToInt] : 
+# 2329|     mu2329_3(..:: *)       = Store[#return]             : &:r2329_1, r2329_2
+# 2327|     r2327_4(glval<..:: *>) = VariableAddress[#return]   : 
+# 2327|     v2327_5(void)          = ReturnValue                : &:r2327_4, ~m?
+# 2327|     v2327_6(void)          = AliasedUse                 : ~m?
+# 2327|     v2327_7(void)          = ExitFunction               : 
+
 perf-regression.cpp:
 #    6| void Big::Big()
 #    6|   Block 0