# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1362688383 -3600
# Node ID 3c29f7da5c66a2ed07305e100de11846727b4977
# Parent  a2a67458a7b637f447cfc8880ec862db2a10fbce
More C++ fixes. Revert alignment change of _number_of_committed_segments.

diff -r a2a67458a7b6 -r 3c29f7da5c66 src/share/vm/code/compiledIC.cpp
--- a/src/share/vm/code/compiledIC.cpp	Thu Mar 07 21:24:17 2013 +0100
+++ b/src/share/vm/code/compiledIC.cpp	Thu Mar 07 21:33:03 2013 +0100
@@ -661,11 +661,7 @@
         case relocInfo::poll_type:
         case relocInfo::poll_return_type: // A safepoint can't overlap a call.
         default:
-#ifdef GRAAL
-          return NULL;
-#else
           ShouldNotReachHere();
-#endif
       }
     }
   }
diff -r a2a67458a7b6 -r 3c29f7da5c66 src/share/vm/code/nmethod.cpp
--- a/src/share/vm/code/nmethod.cpp	Thu Mar 07 21:24:17 2013 +0100
+++ b/src/share/vm/code/nmethod.cpp	Thu Mar 07 21:33:03 2013 +0100
@@ -521,7 +521,7 @@
               code_buffer, frame_size,
               basic_lock_owner_sp_offset, basic_lock_sp_offset,
               oop_maps);
-    if (nm != NULL)  nmethod_stats.note_native_nmethod(nm);
+    NOT_PRODUCT(if (nm != NULL)  nmethod_stats.note_native_nmethod(nm));
     if (PrintAssembly && nm != NULL)
       Disassembler::decode(nm);
   }
diff -r a2a67458a7b6 -r 3c29f7da5c66 src/share/vm/memory/heap.cpp
--- a/src/share/vm/memory/heap.cpp	Thu Mar 07 21:24:17 2013 +0100
+++ b/src/share/vm/memory/heap.cpp	Thu Mar 07 21:33:03 2013 +0100
@@ -127,7 +127,7 @@
   assert(_number_of_reserved_segments >= _number_of_committed_segments, "just checking");
 
   // reserve space for _segmap
-  if (!_segmap.initialize(align_to_allocation_size(_number_of_reserved_segments), align_to_allocation_size(_number_of_committed_segments))) {
+  if (!_segmap.initialize(align_to_page_size(_number_of_reserved_segments), align_to_page_size(_number_of_committed_segments))) {
     return false;
   }