From: Anders Carlsson <andersca@mac.com>
Date: Sun, 6 Feb 2011 20:22:49 +0000 (+0000)
Subject: Simplify test, as suggested by Chris.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5d43ff4e7ea30eaf5a1c417f0ec528900f5c83f2;p=oota-llvm.git

Simplify test, as suggested by Chris.

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

diff --git a/lib/Analysis/ConstantFolding.cpp b/lib/Analysis/ConstantFolding.cpp
index 6c99ad32bbe..95e8bde2a83 100644
--- a/lib/Analysis/ConstantFolding.cpp
+++ b/lib/Analysis/ConstantFolding.cpp
@@ -341,14 +341,10 @@ static bool ReadDataFromGlobal(Constant *C, uint64_t ByteOffset,
   }
   
   if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C)) {
-    if (CE->getOpcode() == Instruction::IntToPtr) {
-      uint64_t PtrSize = TD.getTypeAllocSize(C->getType());
-      uint64_t IntSize = TD.getTypeAllocSize(C->getOperand(0)->getType());
-
-      if (PtrSize == IntSize)
+    if (CE->getOpcode() == Instruction::IntToPtr &&
+        CE->getOperand(0)->getType() == TD.getIntPtrType(CE->getContext())) 
         return ReadDataFromGlobal(CE->getOperand(0), ByteOffset, CurPtr, 
                                   BytesLeft, TD);
-    }
   }
 
   // Otherwise, unknown initializer type.