Merge pull request #22503 from MathiasVP/cpp-fix-two-joins

C++: Fix two joins in IR construction

Author: MathiasVP

cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll

@@ -295,6 +295,11 @@ abstract class MemoryLocation0 extends TMemoryLocation {
  */
 abstract class VirtualVariable extends MemoryLocation0 { }
 
+pragma[nomagic]
+private VirtualVariable getAllocationMemoryLocation(Allocation alloc) {
+  result.getAnAllocation() = alloc
+}
+
 abstract class AllocationMemoryLocation extends MemoryLocation0 {
   Allocation var;
   boolean isMayAccess;
@@ -313,7 +318,7 @@ abstract class AllocationMemoryLocation extends MemoryLocation0 {
       result = getGroupedMemoryLocation(var, false, false).getVirtualVariable()
       or
       not exists(getGroupedMemoryLocation(var, false, false)) and
-      result.(AllocationMemoryLocation).getAnAllocation() = var
+      result = getAllocationMemoryLocation(var)
     )
   }
 

cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedInitialization.qll

@@ -618,6 +618,11 @@ class TranslatedExplicitFieldInitialization extends TranslatedNonDefaultFieldIni
   override int getPosition() { result = position }
 }
 
+pragma[nomagic]
+private Instruction getCallInstruction(TranslatedDefaultFieldInitialization tdfi) {
+  result = tdfi.getInstruction(CallTag())
+}
+
 /**
  * The IR translation of the initialization of a field from an element of an initializer
  * list where default initialization is used.
@@ -642,7 +647,7 @@ class TranslatedDefaultFieldInitialization extends TranslatedFieldInitialization
 
   override Instruction getInstructionSuccessorInternal(InstructionTag tag, EdgeKind kind) {
     tag = CallTargetTag() and
-    result = this.getInstruction(CallTag())
+    result = getCallInstruction(this)
     or
     tag = CallTag() and
     result = this.getSideEffects().getFirstInstruction(kind)