summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Bytecode/Reader/Reader.cpp2
-rw-r--r--lib/CodeGen/DwarfWriter.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Bytecode/Reader/Reader.cpp b/lib/Bytecode/Reader/Reader.cpp
index e57101aeb5..239cf5c20e 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 c3958906b6..888c771705 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)
<< " "