replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ConstantFolding: Avoid a crash. 

Summary:
Check if the parent basic block and caller exists
before calling CS.getCaller when constant folding
strip.invariant.group instrinsic.

This avoids a crash when the function containing the intrinsic
is being inlined. The instruction is checked for any simplifiction
but has not yet been added to a basic block.

Reviewers: Prazek, rsmith, efriedma

Reviewed By: efriedma

Subscribers: eraman, llvm-commits

Differential Revision: https://reviews.llvm.org/D49690

llvm-svn: 337742
This commit is contained in:
Manoj Gupta 2018-07-23 21:20:00 +00:00
parent 9df80e8248
commit f9f50f634d
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
llvm/lib/Analysis/ConstantFolding.cpp
View File

@ -1603,14 +1603,21 @@ Constant *ConstantFoldScalarCall(StringRef Name, unsigned IntrinsicID, Type *Ty,
return Operands[0];
}
if (isa<ConstantPointerNull>(Operands[0]) &&
!NullPointerIsDefined(
CS.getCaller(), Operands[0]->getType()->getPointerAddressSpace())) {
if (isa<ConstantPointerNull>(Operands[0])) {
// launder(null) == null == strip(null) iff in addrspace 0
if (IntrinsicID == Intrinsic::launder_invariant_group ||
IntrinsicID == Intrinsic::strip_invariant_group)
return Operands[0];
return nullptr;
IntrinsicID == Intrinsic::strip_invariant_group) {
// If instruction is not yet put in a basic block (e.g. when cloning
// a function during inlining), CS caller may not be available.
// So check CS's BB first before querying CS.getCaller.
const Function *Caller = CS.getParent() ? CS.getCaller() : nullptr;
if (Caller &&
!NullPointerIsDefined(
Caller, Operands[0]->getType()->getPointerAddressSpace())) {
return Operands[0];
}
return nullptr;
}
}
if (auto *Op = dyn_cast<ConstantFP>(Operands[0])) {

19
llvm/test/Transforms/Inline/inline_inv_group.ll Normal file
View File

@ -0,0 +1,19 @@
; RUN: opt < %s -inline -S | FileCheck %s
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
define i8* @callee() alwaysinline {
; CHECK-LABEL: define i8* @callee()
%1 = call i8* @llvm.strip.invariant.group.p0i8(i8* null)
ret i8* %1
}
define i8* @caller() {
; CHECK-LABEL: define i8* @caller()
; CHECK-NEXT: call i8* @llvm.strip.invariant.group.p0i8(i8* null)
%1 = call i8* @callee()
ret i8* %1
}
declare i8* @llvm.strip.invariant.group.p0i8(i8*)