commit b82d79aa65de2fa913eddb9e291d717a83af6633
author John Porto <jpp@chromium.org> Tue Mar 01 06:11:05 2016 -0800
committer John Porto <jpp@chromium.org> Tue Mar 01 06:11:05 2016 -0800
tree 773e6ff9cfe6c84af3e6f4d68f02024008da2819
parent 1bdb73522937503501201ac387bc1477ea5fa29a

Subzero. ARM32. Reverts cl 1687553002.

BUG= https://bugs.chromium.org/p/nativeclient/issues/detail?id=4076
R=stichnot@chromium.org

Review URL: https://codereview.chromium.org/1745393002 .

src/IceTargetLoweringARM32.cpp

diff --git a/src/IceTargetLoweringARM32.cpp b/src/IceTargetLoweringARM32.cpp
index e5abe21..c722438 100644
--- a/src/IceTargetLoweringARM32.cpp
+++ b/src/IceTargetLoweringARM32.cpp
@@ -3592,10 +3592,7 @@
 }
 
 void TargetARM32::lowerCall(const InstCall *Instr) {
-  // Note: Keep original call target. This allows us to call the correct
-  // postamble helper, even if the CallTarget gets modified during lowering.
-  Operand *OrigCallTarget = Instr->getCallTarget();
-  Operand *CallTarget = OrigCallTarget;
+  Operand *CallTarget = Instr->getCallTarget();
   if (Instr->isTargetHelperCall()) {
     auto TargetHelperPreamble = ARM32HelpersPreamble.find(CallTarget);
     if (TargetHelperPreamble != ARM32HelpersPreamble.end()) {
@@ -3720,9 +3717,12 @@
     }
   }
 
-  // Note: To allow far calls, even for constant relocatables, we force
-  // the call target into a register, and make an indirect call.
-  CallTarget = legalizeToReg(CallTarget);
+  // Allow ConstantRelocatable to be left alone as a direct call, but force
+  // other constants like ConstantInteger32 to be in a register and make it an
+  // indirect call.
+  if (!llvm::isa<ConstantRelocatable>(CallTarget)) {
+    CallTarget = legalize(CallTarget, Legal_Reg);
+  }
 
   // Copy arguments to be passed in registers to the appropriate registers.
   CfgVector<Variable *> RegArgs;
@@ -3777,7 +3777,7 @@
   }
 
   if (Instr->isTargetHelperCall()) {
-    auto TargetHelpersPostamble = ARM32HelpersPostamble.find(OrigCallTarget);
+    auto TargetHelpersPostamble = ARM32HelpersPostamble.find(CallTarget);
     if (TargetHelpersPostamble != ARM32HelpersPostamble.end()) {
       (this->*TargetHelpersPostamble->second)(Instr);
     }