From f06226f506893aaced97c19a38a667324e8fa1f2 Mon Sep 17 00:00:00 2001
From: Dan Gohman <gohman@apple.com>
Date: Mon, 28 Apr 2008 20:25:15 +0000
Subject: Fix a pointer-arithmetic bug that caused 64-bit host pointer values
 to be truncated to 32 bits. This fixes the recent Benchmarks/McCat/09-vor
 regression on x86-64, among other things.

llvm-svn: 50372
---
 llvm/lib/Support/Allocator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'llvm/lib/Support/Allocator.cpp')

diff --git a/llvm/lib/Support/Allocator.cpp b/llvm/lib/Support/Allocator.cpp
index 8ccd3908446..4b6f9ff7b13 100644
--- a/llvm/lib/Support/Allocator.cpp
+++ b/llvm/lib/Support/Allocator.cpp
@@ -48,7 +48,7 @@ public:
   void *Allocate(unsigned AllocSize, unsigned Alignment, MemRegion **RegPtr) {
     
     char* Result = (char*) (((uintptr_t) (NextPtr+Alignment-1)) 
-                            & ~(Alignment-1));
+                            & ~((uintptr_t) Alignment-1));
 
     // Speculate the new value of NextPtr.
     char* NextPtrTmp = Result + AllocSize;
-- 
cgit v1.2.3