--- old/src/share/vm/gc_interface/collectedHeap.cpp	2011-12-28 15:57:49.302687009 +0100
+++ new/src/share/vm/gc_interface/collectedHeap.cpp	2011-12-28 15:57:49.170687437 +0100
@@ -482,14 +482,14 @@
   assert(!heap->is_in(NULL), "NULL is unexpectedly in the heap");
 
   // Test that a pointer to before the heap start is reported as outside the heap.
-  assert(heap->_reserved.start() >= (void*)MinObjAlignment, "sanity");
-  void* before_heap = (void*)((intptr_t)heap->_reserved.start() - MinObjAlignment);
+  assert(heap->_reserved.start() >= (void*)(uintptr_t)MinObjAlignment, "sanity");
+  void* before_heap = (void*)((uintptr_t)heap->_reserved.start() - MinObjAlignment);
   assert(!heap->is_in(before_heap),
       err_msg("before_heap: " PTR_FORMAT " is unexpectedly in the heap", before_heap));
 
   // Test that a pointer to after the heap end is reported as outside the heap.
-  assert(heap->_reserved.end() <= (void*)(uintptr_t(-1) - (uint)MinObjAlignment), "sanity");
-  void* after_heap = (void*)((intptr_t)heap->_reserved.end() + MinObjAlignment);
+  assert(heap->_reserved.end() <= (void*)(uintptr_t(-1) - MinObjAlignment), "sanity");
+  void* after_heap = (void*)((uintptr_t)heap->_reserved.end() + MinObjAlignment);
   assert(!heap->is_in(after_heap),
       err_msg("after_heap: " PTR_FORMAT " is unexpectedly in the heap", after_heap));
 }