Skip to content

Commit

Permalink
[Function Specialisation] Fix use after free
Browse files Browse the repository at this point in the history
This is a fix for a use-after-free found by the address sanitizer when
compiling GCC: #52821

The Function Specialization pass may remove instructions, cached
inside the PredicateBase class, which are later being dereferenced
from the SCCPInstVisitor class. To prevent the dangling references
I am lazily deleting the dead instructions after the Solver has run.

Differential Revision: https://reviews.llvm.org/D118591
  • Loading branch information
labrinea committed Feb 2, 2022
1 parent 116c1be commit 438a81a
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 2 deletions.
19 changes: 17 additions & 2 deletions llvm/lib/Transforms/IPO/FunctionSpecialization.cpp
Expand Up @@ -276,6 +276,7 @@ class FunctionSpecializer {
std::function<TargetLibraryInfo &(Function &)> GetTLI;

SmallPtrSet<Function *, 2> SpecializedFuncs;
SmallVector<Instruction *> ReplacedWithConstant;

public:
FunctionSpecializer(SCCPSolver &Solver,
Expand Down Expand Up @@ -320,6 +321,15 @@ class FunctionSpecializer {
return Changed;
}

void removeDeadInstructions() {
for (auto *I : ReplacedWithConstant) {
LLVM_DEBUG(dbgs() << "FnSpecialization: Removing dead instruction "
<< *I << "\n");
I->eraseFromParent();
}
ReplacedWithConstant.clear();
}

bool tryToReplaceWithConstant(Value *V) {
if (!V->getType()->isSingleValueType() || isa<CallBase>(V) ||
V->user_empty())
Expand All @@ -330,6 +340,10 @@ class FunctionSpecializer {
return false;
auto *Const =
isConstant(IV) ? Solver.getConstant(IV) : UndefValue::get(V->getType());

LLVM_DEBUG(dbgs() << "FnSpecialization: Replacing " << *V
<< "\nFnSpecialization: with " << *Const << "\n");

V->replaceAllUsesWith(Const);

for (auto *U : Const->users())
Expand All @@ -340,7 +354,7 @@ class FunctionSpecializer {
// Remove the instruction from Block and Solver.
if (auto *I = dyn_cast<Instruction>(V)) {
if (I->isSafeToRemove()) {
I->eraseFromParent();
ReplacedWithConstant.push_back(I);
Solver.removeLatticeValueFor(I);
}
}
Expand Down Expand Up @@ -886,7 +900,8 @@ bool llvm::runFunctionSpecialization(
Changed = true;
}

// Clean up the IR by removing ssa_copy intrinsics.
// Clean up the IR by removing dead instructions and ssa_copy intrinsics.
FS.removeDeadInstructions();
removeSSACopy(M);
return Changed;
}
@@ -0,0 +1,58 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; RUN: opt -function-specialization -S < %s | FileCheck %s

%mystruct = type { i32, [2 x i64] }

define internal %mystruct* @myfunc(%mystruct* %arg) {
; CHECK-LABEL: @myfunc(
; CHECK-NEXT: entry:
; CHECK-NEXT: br label [[FOR_COND:%.*]]
; CHECK: for.cond:
; CHECK-NEXT: br i1 true, label [[FOR_COND2:%.*]], label [[FOR_BODY:%.*]]
; CHECK: for.body:
; CHECK-NEXT: call void @callee(%mystruct* nonnull null)
; CHECK-NEXT: br label [[FOR_COND]]
; CHECK: for.cond2:
; CHECK-NEXT: br i1 false, label [[FOR_END:%.*]], label [[FOR_BODY2:%.*]]
; CHECK: for.body2:
; CHECK-NEXT: [[ARRAYIDX:%.*]] = getelementptr inbounds [[MYSTRUCT:%.*]], %mystruct* null, i64 0, i32 1, i64 3
; CHECK-NEXT: br label [[FOR_COND2]]
; CHECK: for.end:
; CHECK-NEXT: ret %mystruct* [[ARG:%.*]]
;
entry:
br label %for.cond

for.cond: ; preds = %for.body, %entry
%phi = phi %mystruct* [ undef, %for.body ], [ null, %entry ]
%cond = icmp eq %mystruct* %phi, null
br i1 %cond, label %for.cond2, label %for.body

for.body: ; preds = %for.cond
call void @callee(%mystruct* nonnull %phi)
br label %for.cond

for.cond2: ; preds = %for.body2, %for.cond
%phi2 = phi %mystruct* [ undef, %for.body2 ], [ null, %for.cond ]
br i1 undef, label %for.end, label %for.body2

for.body2: ; preds = %for.cond2
%arrayidx = getelementptr inbounds %mystruct, %mystruct* %phi2, i64 0, i32 1, i64 3
br label %for.cond2

for.end: ; preds = %for.cond2
ret %mystruct* %arg
}

define %mystruct* @caller() {
; CHECK-LABEL: @caller(
; CHECK-NEXT: entry:
; CHECK-NEXT: [[CALL:%.*]] = call %mystruct* @myfunc(%mystruct* undef)
; CHECK-NEXT: ret %mystruct* [[CALL]]
;
entry:
%call = call %mystruct* @myfunc(%mystruct* undef)
ret %mystruct* %call
}

declare void @callee(%mystruct*)

0 comments on commit 438a81a

Please sign in to comment.