From: Sanjoy Das Date: Fri, 8 Apr 2016 01:31:02 +0000 (+0000) Subject: Adapt to LLVM API change X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f60a0d74522ea4abd1cafcec4dd19dfeab258f8f;p=platform%2Fupstream%2Fllvm.git Adapt to LLVM API change Replace mayBeOverridden with isInterposable llvm-svn: 265767 --- diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp index b1814e7..23b0be1 100644 --- a/clang/lib/CodeGen/CodeGenFunction.cpp +++ b/clang/lib/CodeGen/CodeGenFunction.cpp @@ -921,7 +921,7 @@ void CodeGenFunction::EmitBlockWithFallThrough(llvm::BasicBlock *BB, static void TryMarkNoThrow(llvm::Function *F) { // LLVM treats 'nounwind' on a function as part of the type, so we // can't do this on functions that can be overwritten. - if (F->mayBeOverridden()) return; + if (F->isInterposable()) return; for (llvm::BasicBlock &BB : *F) for (llvm::Instruction &I : BB) diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index db1ed3c..efafa5d 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -332,7 +332,7 @@ void CodeGenModule::checkAliases() { // to its aliasee's aliasee. We also warn, since the user is probably // expecting the link to be weak. if (auto GA = dyn_cast(AliaseeGV)) { - if (GA->mayBeOverridden()) { + if (GA->isInterposable()) { Diags.Report(AA->getLocation(), diag::warn_alias_to_weak_alias) << GV->getName() << GA->getName(); Aliasee = llvm::ConstantExpr::getPointerBitCastOrAddrSpaceCast(