--- old/src/share/vm/runtime/arguments.cpp	2016-02-11 04:32:47.164791582 -0800
+++ new/src/share/vm/runtime/arguments.cpp	2016-02-11 04:32:46.997776233 -0800
@@ -2309,6 +2309,18 @@
 //===========================================================================================================
 // Parsing of main arguments
 
+// Check consistency of JVMCI args
+#if INCLUDE_JVMCI
+bool Arguments::check_jvmci_flag_consistency() {
+
+  if (!EnableJVMCI && UseJVMCICompiler) {
+    jio_fprintf(defaultStream::error_stream(), "EnableJVMCI must be enabled\n");
+    return false;
+  }
+  return true;
+}
+#endif
+
 // Check consistency of GC selection
 bool Arguments::check_gc_consistency() {
   // Ensure that the user has not selected conflicting sets
@@ -2405,6 +2417,7 @@
 #endif
   }
 #if INCLUDE_JVMCI
+  status = status && check_jvmci_flag_consistency();
   if (EnableJVMCI) {
     if (!ScavengeRootsInCode) {
       warning("forcing ScavengeRootsInCode non-zero because JVMCI is enabled");
--- old/src/share/vm/runtime/arguments.hpp	2016-02-11 04:32:47.907859870 -0800
+++ new/src/share/vm/runtime/arguments.hpp	2016-02-11 04:32:47.775847738 -0800
@@ -503,6 +503,11 @@
   static inline bool gc_selected(); // whether a gc has been selected
   static void select_gc_ergonomically();
 
+  // Check jvmci flag consistency 
+#if INCLUDE_JVMCI
+  static bool check_jvmci_flag_consistency();
+#endif
+
   // Check for consistency in the selection of the garbage collector.
   static bool check_gc_consistency();        // Check user-selected gc
   // Check consistency or otherwise of VM argument settings