Merge
authorbrutisso
Wed, 09 Mar 2016 14:54:18 +0100
changeset 37049 76b0378cf033
parent 37047 ba4d0448cc09 (current diff)
parent 37048 6076d323626d (diff)
child 37050 85b12760d820
Merge
--- a/hotspot/src/share/vm/gc/shared/barrierSet.cpp	Wed Mar 09 12:30:39 2016 +0100
+++ b/hotspot/src/share/vm/gc/shared/barrierSet.cpp	Wed Mar 09 14:54:18 2016 +0100
@@ -30,10 +30,6 @@
 // count is number of array elements being written
 void BarrierSet::static_write_ref_array_pre(HeapWord* start, size_t count) {
   assert(count <= (size_t)max_intx, "count too large");
-#if 0
-  warning("Pre: \t" INTPTR_FORMAT "[" SIZE_FORMAT "]\t",
-                   start,            count);
-#endif
   if (UseCompressedOops) {
     Universe::heap()->barrier_set()->write_ref_array_pre((narrowOop*)start, (int)count, false);
   } else {
--- a/hotspot/src/share/vm/gc/shared/barrierSet.inline.hpp	Wed Mar 09 12:30:39 2016 +0100
+++ b/hotspot/src/share/vm/gc/shared/barrierSet.inline.hpp	Wed Mar 09 14:54:18 2016 +0100
@@ -78,10 +78,6 @@
   // If compressed oops were not being used, these should already be aligned
   assert(UseCompressedOops || (aligned_start == start && aligned_end == end),
          "Expected heap word alignment of start and end");
-#if 0
-  warning("Post:\t" INTPTR_FORMAT "[" SIZE_FORMAT "] : [" INTPTR_FORMAT "," INTPTR_FORMAT ")\t",
-                   start,            count,              aligned_start,   aligned_end);
-#endif
   write_ref_array_work(MemRegion(aligned_start, aligned_end));
 }