From f38fb765d00a9e5da569db2bad94e6fe87432da0 Mon Sep 17 00:00:00 2001
From: coleenp <unknown>
Date: Thu, 3 Mar 2011 19:53:03 -0500
Subject: [PATCH] 7021653: Parfait issue in
 hotspot/src/share/vm/oops/methodDataOops.hpp Summary: Fix compilation
 error(s) Reviewed-by: kvn, phh, jcoomes, dholmes

---
 src/share/vm/oops/methodDataOop.hpp | 2 +-
 src/share/vm/runtime/os.cpp         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/share/vm/oops/methodDataOop.hpp b/src/share/vm/oops/methodDataOop.hpp
index 906b18ea8..6f556747c 100644
--- a/src/share/vm/oops/methodDataOop.hpp
+++ b/src/share/vm/oops/methodDataOop.hpp
@@ -228,7 +228,7 @@ public:
     return byte_offset_of(DataLayout, _header._struct._bci);
   }
   static ByteSize cell_offset(int index) {
-    return byte_offset_of(DataLayout, _cells[index]);
+    return byte_offset_of(DataLayout, _cells) + in_ByteSize(index * cell_size);
   }
   // Return a value which, when or-ed as a byte into _flags, sets the flag.
   static int flag_number_to_byte_constant(int flag_number) {
diff --git a/src/share/vm/runtime/os.cpp b/src/share/vm/runtime/os.cpp
index f13b5e288..864a6a78a 100644
--- a/src/share/vm/runtime/os.cpp
+++ b/src/share/vm/runtime/os.cpp
@@ -633,10 +633,10 @@ void  os::free(void *memblock) {
       *q = (u_char)freeBlockPad;
     }
     if (PrintMalloc && tty != NULL)
-      fprintf(stderr, "os::free " SIZE_FORMAT " bytes --> " PTR_FORMAT "\n", size, memblock);
+      fprintf(stderr, "os::free " SIZE_FORMAT " bytes --> " PTR_FORMAT "\n", size, (uintptr_t)memblock);
   } else if (PrintMalloc && tty != NULL) {
     // tty->print_cr("os::free %p", memblock);
-    fprintf(stderr, "os::free " PTR_FORMAT "\n", memblock);
+    fprintf(stderr, "os::free " PTR_FORMAT "\n", (uintptr_t)memblock);
   }
 #endif
   ::free((char*)memblock - space_before);
-- 
GitLab