diff -r 4b7dae855f23 -r e4fdca451542 src/hotspot/share/gc/g1/g1SharedClosures.hpp
--- a/src/hotspot/share/gc/g1/g1SharedClosures.hpp	Mon Mar 05 11:16:23 2018 +0100
+++ b/src/hotspot/share/gc/g1/g1SharedClosures.hpp	Mon Mar 05 11:32:17 2018 +0100
@@ -31,11 +31,11 @@
 class G1ParScanThreadState;
 
 // Simple holder object for a complete set of closures used by the G1 evacuation code.
-template <G1Mark Mark, bool use_ext = false>
+template <G1Mark Mark>
 class G1SharedClosures VALUE_OBJ_CLASS_SPEC {
 public:
-  G1ParCopyClosure<G1BarrierNone, Mark, use_ext> _oops;
-  G1ParCopyClosure<G1BarrierCLD,  Mark, use_ext> _oops_in_cld;
+  G1ParCopyClosure<G1BarrierNone, Mark> _oops;
+  G1ParCopyClosure<G1BarrierCLD,  Mark> _oops_in_cld;
 
   G1CLDScanClosure                _clds;
   G1CodeBlobClosure               _codeblobs;