diff src/share/vm/memory/universe.cpp @ 9062:8be1318fbe77

Merge
author dcubed
date Fri, 05 Apr 2013 10:38:08 -0700
parents 24ef5fb05e0f cc32ccaaf47f
children 89e4d67fdd2a b06ac540229e b295e132102d
line wrap: on
line diff
--- a/src/share/vm/memory/universe.cpp	Thu Apr 04 21:15:43 2013 -0700
+++ b/src/share/vm/memory/universe.cpp	Fri Apr 05 10:38:08 2013 -0700
@@ -1326,6 +1326,8 @@
 static uintptr_t _verify_klass_data[2] = {0, (uintptr_t)-1};
 
 
+#ifndef PRODUCT
+
 static void calculate_verify_data(uintptr_t verify_data[2],
                                   HeapWord* low_boundary,
                                   HeapWord* high_boundary) {
@@ -1360,9 +1362,7 @@
   verify_data[1] = bits;
 }
 
-
 // Oop verification (see MacroAssembler::verify_oop)
-#ifndef PRODUCT
 
 uintptr_t Universe::verify_oop_mask() {
   MemRegion m = heap()->reserved_region();