Add function GetConstantValueAsUnsignedInt.

Fix 2 bugs in FoldGetElemChain so index vector is not modified
when no GEPs are folded in, and so a hasLeadingZero is computed
only for the last folded GEP, not the one after that if any.


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

2 files changed, 98 insertions, 104 deletions

diff --git a/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp b/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp
index 9123023..e4a188e 100644
--- a/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp
+++ b/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp
@@ -57,11 +57,13 @@ InsertCodeToLoadConstant(Function *F,
 
 
 //---------------------------------------------------------------------------
+// Function GetConstantValueAsUnsignedInt
 // Function GetConstantValueAsSignedInt
 // 
-// Convenience function to get the value of an integer constant, for an
-// appropriate integer or non-integer type that can be held in an integer.
-// The type of the argument must be the following:
+// Convenience functions to get the value of an integral constant, for an
+// appropriate integer or non-integer type that can be held in a signed
+// or unsigned integer respectively.  The type of the argument must be
+// the following:
 //      Signed or unsigned integer
 //      Boolean
 //      Pointer
@@ -69,37 +71,38 @@ InsertCodeToLoadConstant(Function *F,
 // isValidConstant is set to true if a valid constant was found.
 //---------------------------------------------------------------------------
 
+uint64_t
+GetConstantValueAsUnsignedInt(const Value *V,
+                              bool &isValidConstant)
+{
+  isValidConstant = true;
+
+  if (isa<Constant>(V))
+    if (V->getType() == Type::BoolTy)
+      return (int64_t) cast<ConstantBool>(V)->getValue();
+    else if (V->getType()->isIntegral())
+      return (V->getType()->isUnsigned()
+              ? cast<ConstantUInt>(V)->getValue()
+              : (uint64_t) cast<ConstantSInt>(V)->getValue());
+
+  isValidConstant = false;
+  return 0;
+}
+
 int64_t
 GetConstantValueAsSignedInt(const Value *V,
                             bool &isValidConstant)
 {
-  if (!isa<Constant>(V))
-    {
+  uint64_t C = GetConstantValueAsUnsignedInt(V, isValidConstant);
+  if (isValidConstant) {
+    if (V->getType()->isSigned() || C < INT64_MAX) // safe to cast to signed
+      return (int64_t) C;
+    else
       isValidConstant = false;
-      return 0;
-    }
-  
-  isValidConstant = true;
-  
-  if (V->getType() == Type::BoolTy)
-    return (int64_t) cast<ConstantBool>(V)->getValue();
-  
-  if (V->getType()->isIntegral())
-    {
-      if (V->getType()->isSigned())
-        return cast<ConstantSInt>(V)->getValue();
-      
-      assert(V->getType()->isUnsigned());
-      uint64_t Val = cast<ConstantUInt>(V)->getValue();
-      if (Val < INT64_MAX)     // then safe to cast to signed
-        return (int64_t)Val;
-    }
-  
-  isValidConstant = false;
+  }
   return 0;
 }
 
-
 //---------------------------------------------------------------------------
 // Function: FoldGetElemChain
 // 
@@ -131,47 +134,41 @@ FoldGetElemChain(const InstructionNode* getElemInstrNode,
 	 ptrChild->getOpLabel() == GetElemPtrIdx)
     {
       // Child is a GetElemPtr instruction
-      getElemInst = (MemAccessInst*)
-	((InstructionNode*) ptrChild)->getInstruction();
-      const vector<Value*>& idxVec = getElemInst->copyIndices();
+      getElemInst = cast<MemAccessInst>(ptrChild->getValue());
+      MemAccessInst::op_iterator OI, firstIdx = getElemInst->idx_begin();
+      MemAccessInst::op_iterator lastIdx = getElemInst->idx_end();
       bool allConstantOffsets = true;
-      
-      // Check for a leading [0] index, if any.  It will be discarded later.
-      ConstantUInt* CV = dyn_cast<ConstantUInt>(idxVec[0]);
-      hasLeadingZero = bool(CV && CV->getType() == Type::UIntTy &&
-                            (CV->getValue() == 0));
-      
+
       // Check that all offsets are constant for this instruction
-      for (unsigned int i=0; i < idxVec.size(); i++)
-        if (! isa<ConstantUInt>(idxVec[i]))
-          {
-            allConstantOffsets = false; 
-            break;
-          }
-      
+      for (OI = firstIdx; allConstantOffsets && OI != lastIdx; ++OI)
+        allConstantOffsets = isa<ConstantInt>(*OI);
+
       if (allConstantOffsets)
         { // Get pointer value out of ptrChild.
           ptrVal = getElemInst->getPointerOperand();
-          
-          // Insert its index vector at the start.
+
+          // Check for a leading [0] index, if any.  It will be discarded later.
+          ConstantUInt* CV = dyn_cast<ConstantUInt>((Value*) *firstIdx);
+          hasLeadingZero = bool(CV && CV->getValue() == 0);
+
+          // Insert its index vector at the start, skipping any leading [0]
           chainIdxVec.insert(chainIdxVec.begin(),
-                             idxVec.begin() + (hasLeadingZero? 1:0),
-                             idxVec.end());
-          
+                             firstIdx + hasLeadingZero, lastIdx);
+
           // Mark the folded node so no code is generated for it.
           ((InstructionNode*) ptrChild)->markFoldedIntoParent();
         }
       else // cannot fold this getElementPtr instr. or any further ones
         break;
-      
+
       ptrChild = ptrChild->leftChild();
     }
-  
+
   // If the first getElementPtr instruction had a leading [0], add it back.
-  // Note that this instruction is the *last* one handled above.
-  if (hasLeadingZero) 
+  // Note that this instruction is the *last* one successfully folded above.
+  if (ptrVal && hasLeadingZero) 
     chainIdxVec.insert(chainIdxVec.begin(), ConstantUInt::get(Type::UIntTy,0));
-  
+
   return ptrVal;
 }
 
diff --git a/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp b/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp
index 9123023..e4a188e 100644
--- a/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp
+++ b/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp
@@ -57,11 +57,13 @@ InsertCodeToLoadConstant(Function *F,
 
 
 //---------------------------------------------------------------------------
+// Function GetConstantValueAsUnsignedInt
 // Function GetConstantValueAsSignedInt
 // 
-// Convenience function to get the value of an integer constant, for an
-// appropriate integer or non-integer type that can be held in an integer.
-// The type of the argument must be the following:
+// Convenience functions to get the value of an integral constant, for an
+// appropriate integer or non-integer type that can be held in a signed
+// or unsigned integer respectively.  The type of the argument must be
+// the following:
 //      Signed or unsigned integer
 //      Boolean
 //      Pointer
@@ -69,37 +71,38 @@ InsertCodeToLoadConstant(Function *F,
 // isValidConstant is set to true if a valid constant was found.
 //---------------------------------------------------------------------------
 
+uint64_t
+GetConstantValueAsUnsignedInt(const Value *V,
+                              bool &isValidConstant)
+{
+  isValidConstant = true;
+
+  if (isa<Constant>(V))
+    if (V->getType() == Type::BoolTy)
+      return (int64_t) cast<ConstantBool>(V)->getValue();
+    else if (V->getType()->isIntegral())
+      return (V->getType()->isUnsigned()
+              ? cast<ConstantUInt>(V)->getValue()
+              : (uint64_t) cast<ConstantSInt>(V)->getValue());
+
+  isValidConstant = false;
+  return 0;
+}
+
 int64_t
 GetConstantValueAsSignedInt(const Value *V,
                             bool &isValidConstant)
 {
-  if (!isa<Constant>(V))
-    {
+  uint64_t C = GetConstantValueAsUnsignedInt(V, isValidConstant);
+  if (isValidConstant) {
+    if (V->getType()->isSigned() || C < INT64_MAX) // safe to cast to signed
+      return (int64_t) C;
+    else
       isValidConstant = false;
-      return 0;
-    }
-  
-  isValidConstant = true;
-  
-  if (V->getType() == Type::BoolTy)
-    return (int64_t) cast<ConstantBool>(V)->getValue();
-  
-  if (V->getType()->isIntegral())
-    {
-      if (V->getType()->isSigned())
-        return cast<ConstantSInt>(V)->getValue();
-      
-      assert(V->getType()->isUnsigned());
-      uint64_t Val = cast<ConstantUInt>(V)->getValue();
-      if (Val < INT64_MAX)     // then safe to cast to signed
-        return (int64_t)Val;
-    }
-  
-  isValidConstant = false;
+  }
   return 0;
 }
 
-
 //---------------------------------------------------------------------------
 // Function: FoldGetElemChain
 // 
@@ -131,47 +134,41 @@ FoldGetElemChain(const InstructionNode* getElemInstrNode,
 	 ptrChild->getOpLabel() == GetElemPtrIdx)
     {
       // Child is a GetElemPtr instruction
-      getElemInst = (MemAccessInst*)
-	((InstructionNode*) ptrChild)->getInstruction();
-      const vector<Value*>& idxVec = getElemInst->copyIndices();
+      getElemInst = cast<MemAccessInst>(ptrChild->getValue());
+      MemAccessInst::op_iterator OI, firstIdx = getElemInst->idx_begin();
+      MemAccessInst::op_iterator lastIdx = getElemInst->idx_end();
       bool allConstantOffsets = true;
-      
-      // Check for a leading [0] index, if any.  It will be discarded later.
-      ConstantUInt* CV = dyn_cast<ConstantUInt>(idxVec[0]);
-      hasLeadingZero = bool(CV && CV->getType() == Type::UIntTy &&
-                            (CV->getValue() == 0));
-      
+
       // Check that all offsets are constant for this instruction
-      for (unsigned int i=0; i < idxVec.size(); i++)
-        if (! isa<ConstantUInt>(idxVec[i]))
-          {
-            allConstantOffsets = false; 
-            break;
-          }
-      
+      for (OI = firstIdx; allConstantOffsets && OI != lastIdx; ++OI)
+        allConstantOffsets = isa<ConstantInt>(*OI);
+
       if (allConstantOffsets)
         { // Get pointer value out of ptrChild.
           ptrVal = getElemInst->getPointerOperand();
-          
-          // Insert its index vector at the start.
+
+          // Check for a leading [0] index, if any.  It will be discarded later.
+          ConstantUInt* CV = dyn_cast<ConstantUInt>((Value*) *firstIdx);
+          hasLeadingZero = bool(CV && CV->getValue() == 0);
+
+          // Insert its index vector at the start, skipping any leading [0]
           chainIdxVec.insert(chainIdxVec.begin(),
-                             idxVec.begin() + (hasLeadingZero? 1:0),
-                             idxVec.end());
-          
+                             firstIdx + hasLeadingZero, lastIdx);
+
           // Mark the folded node so no code is generated for it.
           ((InstructionNode*) ptrChild)->markFoldedIntoParent();
         }
       else // cannot fold this getElementPtr instr. or any further ones
         break;
-      
+
       ptrChild = ptrChild->leftChild();
     }
-  
+
   // If the first getElementPtr instruction had a leading [0], add it back.
-  // Note that this instruction is the *last* one handled above.
-  if (hasLeadingZero) 
+  // Note that this instruction is the *last* one successfully folded above.
+  if (ptrVal && hasLeadingZero) 
     chainIdxVec.insert(chainIdxVec.begin(), ConstantUInt::get(Type::UIntTy,0));
-  
+
   return ptrVal;
 }