[llvm-branch-commits] [llvm-branch] r124427 - /llvm/branches/Apple/sill/lib/Target/ARM/ARMFastISel.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Thu Jan 27 14:31:52 2011
New Revision: 124427

URL: http://llvm.org/viewvc/llvm-project?rev=124427&view=rev
Log:
Manually merge reversion of 123010 and 123008, which were not appropriate for
this branch.

Modified:
    llvm/branches/Apple/sill/lib/Target/ARM/ARMFastISel.cpp

Modified: llvm/branches/Apple/sill/lib/Target/ARM/ARMFastISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/sill/lib/Target/ARM/ARMFastISel.cpp?rev=124427&r1=124426&r2=124427&view=diff
==============================================================================
--- llvm/branches/Apple/sill/lib/Target/ARM/ARMFastISel.cpp (original)
+++ llvm/branches/Apple/sill/lib/Target/ARM/ARMFastISel.cpp Thu Jan 27 14:31:52 2011
@@ -1671,19 +1671,12 @@
   // TODO: Turn this into the table of arm call ops.
   MachineInstrBuilder MIB;
   unsigned CallOpc;
-  if(isThumb) {
+  if(isThumb)
     CallOpc = Subtarget->isTargetDarwin() ? ARM::tBLXi_r9 : ARM::tBLXi;
-    // Explicitly adding the predicate here.
-    MIB = AddDefaultPred(BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL,
-                         TII.get(CallOpc)))
-                         .addExternalSymbol(TLI.getLibcallName(Call));
-  } else {
+  else
     CallOpc = Subtarget->isTargetDarwin() ? ARM::BLr9 : ARM::BL;
-    // Explicitly adding the predicate here.
-    MIB = AddDefaultPred(BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL,
-                         TII.get(CallOpc))
-          .addExternalSymbol(TLI.getLibcallName(Call)));
-  }
+  MIB = BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, TII.get(CallOpc))
+        .addExternalSymbol(TLI.getLibcallName(Call));
 
   // Add implicit physical register uses to the call.
   for (unsigned i = 0, e = RegArgs.size(); i != e; ++i)
@@ -1787,21 +1780,13 @@
   // TODO: Turn this into the table of arm call ops.
   MachineInstrBuilder MIB;
   unsigned CallOpc;
-  // Explicitly adding the predicate here.
-  if(isThumb) {
+  if(isThumb)
     CallOpc = Subtarget->isTargetDarwin() ? ARM::tBLXi_r9 : ARM::tBLXi;
-    // Explicitly adding the predicate here.
-    MIB = AddDefaultPred(BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL,
-                         TII.get(CallOpc)))
-          .addGlobalAddress(GV, 0, 0);
-  } else {
+  else
     CallOpc = Subtarget->isTargetDarwin() ? ARM::BLr9 : ARM::BL;
-    // Explicitly adding the predicate here.
-    MIB = AddDefaultPred(BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL,
-                         TII.get(CallOpc))
-          .addGlobalAddress(GV, 0, 0));
-  }
-  
+  MIB = BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, TII.get(CallOpc))
+              .addGlobalAddress(GV, 0, 0);
+
   // Add implicit physical register uses to the call.
   for (unsigned i = 0, e = RegArgs.size(); i != e; ++i)
     MIB.addReg(RegArgs[i]);