Subzero. ARM32. Fixes infinite loop during address mode formation.

BUG= https://bugs.chromium.org/p/nativeclient/issues/detail?id=4076 R=kschimpf@google.com, sehr@chromium.org, stichnot@chromium.org Review URL: https://codereview.chromium.org/1609753002 .

Subzero. ARM32. Fixes infinite loop during address mode formation.
6f534717 · John Porto · 0c68bef8 · 6f534717
Commit 6f534717 authored Jan 20, 2016 by John Porto
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

IceTargetLoweringARM32.cpp src/IceTargetLoweringARM32.cpp +6 -2

No files found.
--- a/src/IceTargetLoweringARM32.cpp
+++ b/src/IceTargetLoweringARM32.cpp
@@ -4849,10 +4849,12 @@ bool matchAssign(const VariablesMetadata *VMetadata, Variable **Var,
    return false;
  Operand *SrcOp = VarAssign->getSrc(0);
+  bool Optimized = false;
  if (auto *SrcVar = llvm::dyn_cast<Variable>(SrcOp)) {
    if (!VMetadata->isMultiDef(SrcVar) ||
        // TODO: ensure SrcVar stays single-BB
        false) {
+      Optimized = true;
      *Var = SrcVar;
    } else if (auto *Const = llvm::dyn_cast<ConstantInteger32>(SrcOp)) {
      int32_t MoreOffset = Const->getValue();
@@ -4861,13 +4863,15 @@ bool matchAssign(const VariablesMetadata *VMetadata, Variable **Var,
        return false;
      *Var = nullptr;
      *Offset += NewOffset;
+      Optimized = true;
    }
+  }
+  if (Optimized) {
    *Reason = VarAssign;
-    return true;
  }
-  return false;
+  return Optimized;
 }
 bool isAddOrSub(const Inst *Inst, InstArithmetic::OpKind *Kind) {