From: Jeff Cohen <jeffc@jolt-lang.org>
Date: Wed, 25 Jan 2006 02:40:10 +0000 (+0000)
Subject: Portably cast a pointer to an integer.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=fb709b6817426c99d2ce48a2d08ef20e376a0e06;hp=badf0d961454fed939b2cb670d41c8464e645541;p=oota-llvm.git

Portably cast a pointer to an integer.


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

diff --git a/lib/Bytecode/Reader/Reader.cpp b/lib/Bytecode/Reader/Reader.cpp
index e57101aeb57..239cf5c20e9 100644
--- a/lib/Bytecode/Reader/Reader.cpp
+++ b/lib/Bytecode/Reader/Reader.cpp
@@ -79,7 +79,7 @@ inline void BytecodeReader::checkPastBlockEnd(const char * block_name) {
 inline void BytecodeReader::align32() {
   if (hasAlignment) {
     BufPtr Save = At;
-    At = (const unsigned char *)((unsigned long)(At+3) & (~3UL));
+    At = (const unsigned char *)((size_t)(At+3) & (~3UL));
     if (At > Save)
       if (Handler) Handler->handleAlignment(At - Save);
     if (At > BlockEnd)
diff --git a/lib/CodeGen/DwarfWriter.cpp b/lib/CodeGen/DwarfWriter.cpp
index c3958906b61..888c7717057 100644
--- a/lib/CodeGen/DwarfWriter.cpp
+++ b/lib/CodeGen/DwarfWriter.cpp
@@ -645,7 +645,7 @@ void DIEAbbrev::Emit(const DwarfWriter &DW) const {
 #ifndef NDEBUG
   void DIEAbbrev::print(std::ostream &O) {
     O << "Abbreviation @"
-      << std::hex << (unsigned long)this << std::dec
+      << std::hex << (size_t)this << std::dec
       << "  "
       << TagString(Tag)
       << " "