[llvm-commits] [vector_llvm] CVS: llvm/lib/ExecutionEngine/ExecutionEngine.cpp

[Robert Bocchino]

Changes in directory llvm/lib/ExecutionEngine:

ExecutionEngine.cpp updated: 1.71 -> 1.71.2.1
---
Log message:

Merged mainline into Vector LLVM branch


---
Diffs of the changes:  (+4 -1)

 ExecutionEngine.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)


Index: llvm/lib/ExecutionEngine/ExecutionEngine.cpp
diff -u llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.71 llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.71.2.1
--- llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.71	Tue Jul 12 10:51:55 2005
+++ llvm/lib/ExecutionEngine/ExecutionEngine.cpp	Wed Nov 16 12:32:19 2005
@@ -189,7 +189,10 @@
       uint64_t Offset =
         TD->getIndexedOffset(CE->getOperand(0)->getType(), Indexes);
 
-      Result.LongVal += Offset;
+      if (getTargetData().getPointerSize() == 4)
+        Result.IntVal += Offset;
+      else
+        Result.LongVal += Offset;
       return Result;
     }
     case Instruction::Cast: {