diff options
| author | Sanjoy Das <sanjoy@playingwithpointers.com> | 2016-04-08 01:31:02 +0000 |
|---|---|---|
| committer | Sanjoy Das <sanjoy@playingwithpointers.com> | 2016-04-08 01:31:02 +0000 |
| commit | f60a0d74522ea4abd1cafcec4dd19dfeab258f8f (patch) | |
| tree | 0a8a9ec7d6950cdd929e1060aabdc6973485b47a /clang | |
| parent | 6a6747d9dd8e89bb6199acf42f10359ed4584561 (diff) | |
| download | bcm5719-llvm-f60a0d74522ea4abd1cafcec4dd19dfeab258f8f.tar.gz bcm5719-llvm-f60a0d74522ea4abd1cafcec4dd19dfeab258f8f.zip | |
Adapt to LLVM API change
Replace mayBeOverridden with isInterposable
llvm-svn: 265767
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/CodeGen/CodeGenFunction.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CodeGenModule.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp index b1814e750df..23b0be181d6 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 db1ed3c6570..efafa5d0955 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<llvm::GlobalAlias>(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( |
