--- old/src/share/vm/gc/g1/g1CollectorPolicy.cpp	2015-11-17 14:17:31.252196945 +0100
+++ new/src/share/vm/gc/g1/g1CollectorPolicy.cpp	2015-11-17 14:17:31.165194353 +0100
@@ -1252,8 +1252,16 @@
 }
 
 G1IHOPControl* G1CollectorPolicy::create_ihop_control() const {
-  return new G1StaticIHOPControl(InitiatingHeapOccupancyPercent,
-                                 G1CollectedHeap::heap()->max_capacity());
+  if (G1UseAdaptiveIHOP) {
+    return new G1AdaptiveIHOPControl(InitiatingHeapOccupancyPercent,
+                                     G1CollectedHeap::heap()->max_capacity(),
+                                     &_predictor,
+                                     G1ReservePercent,
+                                     G1HeapWastePercent);
+  } else {
+    return new G1StaticIHOPControl(InitiatingHeapOccupancyPercent,
+                                   G1CollectedHeap::heap()->max_capacity());
+  }
 }
 
 void G1CollectorPolicy::update_ihop_statistics(double marking_time,