--- a/hotspot/src/share/vm/compiler/compilerDirectives.cpp	Mon Dec 21 11:34:58 2015 +0100
+++ b/hotspot/src/share/vm/compiler/compilerDirectives.cpp	Mon Dec 21 22:17:23 2015 +0100
@@ -561,10 +561,11 @@
             match = dir->_c1_store;
             break;
           }
-        }
-        if (match->EnableOption) {
-          // The directiveSet for this compile is also enabled -> success
-          break;
+        } else {
+          if (match->EnableOption) {
+            // The directiveSet for this compile is also enabled -> success
+            break;
+          }
         }
       }
       dir = dir->next();