--- a/hotspot/src/share/vm/gc/g1/g1CollectorPolicy.cpp	Tue Nov 24 10:22:36 2015 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1CollectorPolicy.cpp	Tue Nov 24 10:35:52 2015 +0100
@@ -1239,8 +1239,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_prediction(double mutator_time_s,