--- old/src/share/vm/gc/g1/g1IHOPControl.cpp	2015-11-23 11:06:51.607361166 +0100
+++ new/src/share/vm/gc/g1/g1IHOPControl.cpp	2015-11-23 11:06:51.517358560 +0100
@@ -79,9 +79,8 @@
   size_t const initial_ihop = 45;
 
   G1StaticIHOPControl ctrl(initial_ihop, 100);
-  size_t threshold;
-  
-  threshold = ctrl.get_conc_mark_start_threshold();
+
+  size_t threshold = ctrl.get_conc_mark_start_threshold();
   assert(threshold == initial_ihop,
          "Expected IHOP threshold of " SIZE_FORMAT " but is " SIZE_FORMAT, initial_ihop, threshold);
 
@@ -106,9 +105,7 @@
   assert(threshold == initial_ihop,
          "Expected IHOP threshold of " SIZE_FORMAT " but is " SIZE_FORMAT, initial_ihop, threshold);
 }
-#endif
 
-#ifndef PRODUCT
 void IHOP_test() {
   G1StaticIHOPControl::test();
 }