From: Chris Lattner <sabre@nondot.org>
Date: Sun, 18 Jul 2004 18:45:01 +0000 (+0000)
Subject: Fix infinite loop
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a51e4f63015b59b05dd0be5a1987bdfd074bb267;p=oota-llvm.git

Fix infinite loop


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@14971 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/PowerPC/PPC32ISelSimple.cpp b/lib/Target/PowerPC/PPC32ISelSimple.cpp
index 340cbe95ef0..72c1ca4c223 100644
--- a/lib/Target/PowerPC/PPC32ISelSimple.cpp
+++ b/lib/Target/PowerPC/PPC32ISelSimple.cpp
@@ -395,11 +395,7 @@ unsigned ISel::getReg(Value *V, MachineBasicBlock *MBB,
   // If this operand is a constant, emit the code to copy the constant into
   // the register here...
   //
-  if (Constant *C = dyn_cast<Constant>(V)) {
-    unsigned Reg = makeAnotherReg(V->getType());
-    copyConstantToRegister(MBB, IPt, C, Reg);
-    return Reg;
-  } else if (GlobalValue *GV = dyn_cast<GlobalValue>(V)) {
+  if (GlobalValue *GV = dyn_cast<GlobalValue>(V)) {
     // GV is located at PC + distance
     unsigned CurPC = makeAnotherReg(Type::IntTy);
     unsigned Reg1 = makeAnotherReg(V->getType());
@@ -412,6 +408,10 @@ unsigned ISel::getReg(Value *V, MachineBasicBlock *MBB,
     BuildMI(*MBB, IPt, PPC32::LOADLoAddr, 2, Reg2).addReg(Reg1)
       .addGlobalAddress(GV);
     return Reg2;
+  } else if (Constant *C = dyn_cast<Constant>(V)) {
+    unsigned Reg = makeAnotherReg(V->getType());
+    copyConstantToRegister(MBB, IPt, C, Reg);
+    return Reg;
   } else if (CastInst *CI = dyn_cast<CastInst>(V)) {
     // Do not emit noop casts at all.
     if (getClassB(CI->getType()) == getClassB(CI->getOperand(0)->getType()))
diff --git a/lib/Target/PowerPC/PowerPCISelSimple.cpp b/lib/Target/PowerPC/PowerPCISelSimple.cpp
index 340cbe95ef0..72c1ca4c223 100644
--- a/lib/Target/PowerPC/PowerPCISelSimple.cpp
+++ b/lib/Target/PowerPC/PowerPCISelSimple.cpp
@@ -395,11 +395,7 @@ unsigned ISel::getReg(Value *V, MachineBasicBlock *MBB,
   // If this operand is a constant, emit the code to copy the constant into
   // the register here...
   //
-  if (Constant *C = dyn_cast<Constant>(V)) {
-    unsigned Reg = makeAnotherReg(V->getType());
-    copyConstantToRegister(MBB, IPt, C, Reg);
-    return Reg;
-  } else if (GlobalValue *GV = dyn_cast<GlobalValue>(V)) {
+  if (GlobalValue *GV = dyn_cast<GlobalValue>(V)) {
     // GV is located at PC + distance
     unsigned CurPC = makeAnotherReg(Type::IntTy);
     unsigned Reg1 = makeAnotherReg(V->getType());
@@ -412,6 +408,10 @@ unsigned ISel::getReg(Value *V, MachineBasicBlock *MBB,
     BuildMI(*MBB, IPt, PPC32::LOADLoAddr, 2, Reg2).addReg(Reg1)
       .addGlobalAddress(GV);
     return Reg2;
+  } else if (Constant *C = dyn_cast<Constant>(V)) {
+    unsigned Reg = makeAnotherReg(V->getType());
+    copyConstantToRegister(MBB, IPt, C, Reg);
+    return Reg;
   } else if (CastInst *CI = dyn_cast<CastInst>(V)) {
     // Do not emit noop casts at all.
     if (getClassB(CI->getType()) == getClassB(CI->getOperand(0)->getType()))