diff options
| -rw-r--r-- | llvm/lib/IR/AutoUpgrade.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/Bitcode/objectsize-upgrade-7.0.ll | 12 | ||||
| -rw-r--r-- | llvm/test/Bitcode/objectsize-upgrade-7.0.ll.bc | bin | 0 -> 984 bytes |
3 files changed, 14 insertions, 2 deletions
diff --git a/llvm/lib/IR/AutoUpgrade.cpp b/llvm/lib/IR/AutoUpgrade.cpp index fbbb5240017..8ebe55a1ea3 100644 --- a/llvm/lib/IR/AutoUpgrade.cpp +++ b/llvm/lib/IR/AutoUpgrade.cpp @@ -743,7 +743,7 @@ static bool UpgradeIntrinsicFunction1(Function *F, Function *&NewFn) { // address space. if (Name.startswith("objectsize.")) { Type *Tys[2] = { F->getReturnType(), F->arg_begin()->getType() }; - if (F->arg_size() == 2 || + if (F->arg_size() == 2 || F->arg_size() == 3 || F->getName() != Intrinsic::getName(Intrinsic::objectsize, Tys)) { rename(F); NewFn = Intrinsic::getDeclaration(F->getParent(), Intrinsic::objectsize, @@ -3461,7 +3461,7 @@ void llvm::UpgradeIntrinsicCall(CallInst *CI, Function *NewFn) { ? Builder.getFalse() : CI->getArgOperand(2); Value *Dynamic = - CI->getNumArgOperands() < 3 ? Builder.getFalse() : CI->getArgOperand(3); + CI->getNumArgOperands() < 4 ? Builder.getFalse() : CI->getArgOperand(3); NewCall = Builder.CreateCall( NewFn, {CI->getArgOperand(0), CI->getArgOperand(1), NullIsUnknownSize, Dynamic}); break; diff --git a/llvm/test/Bitcode/objectsize-upgrade-7.0.ll b/llvm/test/Bitcode/objectsize-upgrade-7.0.ll new file mode 100644 index 00000000000..a7e6d497676 --- /dev/null +++ b/llvm/test/Bitcode/objectsize-upgrade-7.0.ll @@ -0,0 +1,12 @@ +; RUN: llvm-dis < %s.bc | FileCheck %s + +; Bitcode compatibility test for 'dynamic' parameter to llvm.objectsize. + +define void @callit(i8* %ptr) { + %sz = call i64 @llvm.objectsize.i64.p0i8(i8* %ptr, i1 false, i1 true) + ; CHECK: %sz = call i64 @llvm.objectsize.i64.p0i8(i8* %ptr, i1 false, i1 true, i1 false) + ret void +} + +declare i64 @llvm.objectsize.i64.p0i8(i8*, i1, i1) +; CHECK: declare i64 @llvm.objectsize.i64.p0i8(i8*, i1, i1, i1) diff --git a/llvm/test/Bitcode/objectsize-upgrade-7.0.ll.bc b/llvm/test/Bitcode/objectsize-upgrade-7.0.ll.bc Binary files differnew file mode 100644 index 00000000000..115c69dfb9d --- /dev/null +++ b/llvm/test/Bitcode/objectsize-upgrade-7.0.ll.bc |
