From f5ba89df1fb9d52bf6b7ba1def6bd00b8b668336 Mon Sep 17 00:00:00 2001
From: John Criswell <criswell@uiuc.edu>
Date: Wed, 10 Dec 2003 22:51:41 +0000
Subject: [PATCH] This appears to fix Bug 172 and does not break any other
 feature tests or regression tests.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10388 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp        | 6 ++++++
 lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp b/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp
index 44a43596ee3..73e5480d122 100644
--- a/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp
+++ b/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp
@@ -167,6 +167,12 @@ FixConstantOperandsForInstr(Instruction* vmInstr,
             constantThatMustBeLoaded = true;
         }
       } else {
+        //
+        // If the operand is from the constant pool, don't try to change it.
+        //
+        if (mop.getType() == MachineOperand::MO_ConstantPoolIndex) {
+          continue;
+        }
         assert(mop.isImmediate());
         bool isSigned = mop.getType() == MachineOperand::MO_SignExtendedImmed;
 
diff --git a/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp b/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp
index 44a43596ee3..73e5480d122 100644
--- a/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp
+++ b/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp
@@ -167,6 +167,12 @@ FixConstantOperandsForInstr(Instruction* vmInstr,
             constantThatMustBeLoaded = true;
         }
       } else {
+        //
+        // If the operand is from the constant pool, don't try to change it.
+        //
+        if (mop.getType() == MachineOperand::MO_ConstantPoolIndex) {
+          continue;
+        }
         assert(mop.isImmediate());
         bool isSigned = mop.getType() == MachineOperand::MO_SignExtendedImmed;