Skip to content

C++: Fix two joins in IR construction #22503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MathiasVP wants to merge 2 commits into
base: main
Choose a base branch
from
+12 −2
Open

C++: Fix two joins in IR construction #22503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7aa084c
C++: Fix join in AliasedSSA.
MathiasVP Sep 3, 2026
c99bff9
C++: Fix join in IR construction.
MathiasVP Sep 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
)
}

Expand Down
7 changes: 6 additions & 1 deletion cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedInitialization.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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)
Expand Down
Loading