From: Sanjoy Das <sanjoy@playingwithpointers.com>
Date: Fri, 8 Apr 2016 01:31:02 +0000 (+0000)
Subject: Adapt to LLVM API change
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48caba973e0d468c4bf7405ac9606aaca02bfcdb;p=clang

Adapt to LLVM API change

Replace mayBeOverridden with isInterposable

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@265767 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp
index b1814e750d..23b0be181d 100644
--- a/lib/CodeGen/CodeGenFunction.cpp
+++ b/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/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index db1ed3c657..efafa5d095 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/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(