X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=lib%2FAnalysis%2FIPA%2FInlineCost.cpp;h=683637f5b7f737eb24c0539544b8b0474e9593df;hp=a803f8c3bf970161b3420e4177a5380eb91c2e56;hb=d6312bbbbd7739c8bfd8cc1ddad7662b1c6ee158;hpb=0fa7dc4762d6fe0ab811f86e5d2c87231f2abcfe

diff --git a/lib/Analysis/IPA/InlineCost.cpp b/lib/Analysis/IPA/InlineCost.cpp
index a803f8c3bf9..683637f5b7f 100644
--- a/lib/Analysis/IPA/InlineCost.cpp
+++ b/lib/Analysis/IPA/InlineCost.cpp
@@ -1300,8 +1300,14 @@ bool InlineCostAnalysis::isInlineViable(Function &F) {
     F.getAttributes().hasAttribute(AttributeSet::FunctionIndex,
                                    Attribute::ReturnsTwice);
   for (Function::iterator BI = F.begin(), BE = F.end(); BI != BE; ++BI) {
-    // Disallow inlining of functions which contain an indirect branch.
-    if (isa<IndirectBrInst>(BI->getTerminator()))
+    // Disallow inlining of functions which contain an indirect branch,
+    // unless the always_inline attribute is set.
+    // The attribute serves as a assertion that no local address
+    // like a block label can escpape the function.
+    // Revisit enabling inlining for functions with indirect branches
+    // when a more sophisticated espape/points-to analysis becomes available.
+    if (isa<IndirectBrInst>(BI->getTerminator()) &&
+        !F.hasFnAttribute(Attribute::AlwaysInline))
       return false;
 
     for (BasicBlock::iterator II = BI->begin(), IE = BI->end(); II != IE;