--- old/src/hotspot/share/opto/c2_globals.hpp	2018-03-07 09:14:34.813047320 +0100
+++ new/src/hotspot/share/opto/c2_globals.hpp	2018-03-07 09:14:34.650040311 +0100
@@ -759,10 +759,6 @@
   product_pd(bool, UseBasicLoadBarrier,                                     \
           "Force the original simple barrier variant")                      \
                                                                             \
-  /* ZGC temporary flags, remove later */                                   \
-  product(bool, UseR15TestInLoadBarrier, true,                              \
-          "Use R15 + offset for Loadbarrier test")                          \
-                                                                            \
   product(bool, UseCASLoadBarrier, true,                                    \
           "Turn of CAS barrier only, debug tool")                           \
                                                                             \