# HG changeset patch
# User johnc
# Date 1282167873 14400
# Node ID effb55808a18a81aa38b33e802b7df74a726dc53
# Parent  413ad0331a0cd8996fd7fdb639e1a1db09d138cf# Parent  5ed703250bff861112c42ba8519ede31bb885cfb
Merge

diff -r 5ed703250bff -r effb55808a18 src/share/vm/memory/allocation.cpp
--- a/src/share/vm/memory/allocation.cpp	Wed Aug 18 11:39:21 2010 -0700
+++ b/src/share/vm/memory/allocation.cpp	Wed Aug 18 17:44:33 2010 -0400
@@ -58,7 +58,7 @@
 void ResourceObj::operator delete(void* p) {
   assert(((ResourceObj *)p)->allocated_on_C_heap(),
          "delete only allowed for C_HEAP objects");
-  DEBUG_ONLY(((ResourceObj *)p)->_allocation = badHeapOopVal;)
+  DEBUG_ONLY(((ResourceObj *)p)->_allocation = (uintptr_t) badHeapOopVal;)
   FreeHeap(p);
 }
 
@@ -104,7 +104,7 @@
 ResourceObj::~ResourceObj() {
     // allocated_on_C_heap() also checks that encoded (in _allocation) address == this.
     if (!allocated_on_C_heap()) {  // ResourceObj::delete() zaps _allocation for C_heap.
-      _allocation = badHeapOopVal; // zap type
+      _allocation = (uintptr_t) badHeapOopVal; // zap type
     }
 }
 #endif // ASSERT