commit ebe69fe11e48d322045d5949c83283927a0d790b
author Stephen Hines <srhines@google.com> Mon Mar 23 12:10:34 2015 -0700
committer Stephen Hines <srhines@google.com> Mon Mar 23 12:10:34 2015 -0700
tree c92f1907a6b8006628a4b01615f38264d29834ea
parent b7d2e72b02a4cb8034f32f8247a2558d2434e121

Update aosp/master LLVM for rebase to r230699.

Change-Id: I2b5be30509658cb8266be782de0ab24f9099f9b9

lib/CodeGen/BranchFolding.cpp

diff --git a/lib/CodeGen/BranchFolding.cpp b/lib/CodeGen/BranchFolding.cpp
index 2128da1..b8f05cd 100644
--- a/lib/CodeGen/BranchFolding.cpp
+++ b/lib/CodeGen/BranchFolding.cpp
@@ -601,8 +601,7 @@
   // instructions that would be deleted in the merge.
   MachineFunction *MF = MBB1->getParent();
   if (EffectiveTailLen >= 2 &&
-      MF->getFunction()->getAttributes().
-        hasAttribute(AttributeSet::FunctionIndex, Attribute::OptimizeForSize) &&
+      MF->getFunction()->hasFnAttribute(Attribute::OptimizeForSize) &&
       (I1 == MBB1->begin() || I2 == MBB2->begin()))
     return true;