[llvm-commits] CVS: llvm/lib/Target/TargetData.cpp

[Vikram Adve]

Changes in directory llvm/lib/Target:

TargetData.cpp updated: 1.23 -> 1.24

---
Log message:

Don't try to compute the size of an "array" element if the index is 0:
the size may be unknown, and is not needed.


---
Diffs of the changes:

Index: llvm/lib/Target/TargetData.cpp
diff -u llvm/lib/Target/TargetData.cpp:1.23 llvm/lib/Target/TargetData.cpp:1.24
--- llvm/lib/Target/TargetData.cpp:1.23	Wed Sep 25 18:46:55 2002
+++ llvm/lib/Target/TargetData.cpp	Sun Oct 13 16:47:44 2002
@@ -170,11 +170,10 @@
       Ty = cast<SequentialType>(Ty)->getElementType();
 
       // Get the array index and the size of each array element.
-      // Both must be known constants, or this will fail.
-      // Also, the product needs to be sign-extended from 32 to 64 bits.
-      int64_t elementSize = (int64_t)getTypeSize(Ty);
+      // Both must be known constants, or the index shd be 0; else this fails.
       int64_t arrayIdx = cast<ConstantSInt>(Idx[CurIDX])->getValue();
-      Result += (uint64_t)(arrayIdx * elementSize);
+      Result += arrayIdx == 0? 0
+                : (uint64_t) (arrayIdx * (int64_t) getTypeSize(Ty)); 
 
     } else if (const StructType *STy = dyn_cast<const StructType>(Ty)) {
       assert(Idx[CurIDX]->getType() == Type::UByteTy && "Illegal struct idx");