--- old/src/share/vm/runtime/arguments.cpp	2016-02-16 03:54:15.814334218 -0800
+++ new/src/share/vm/runtime/arguments.cpp	2016-02-16 03:54:15.679321817 -0800
@@ -2312,6 +2312,20 @@
 //===========================================================================================================
 // Parsing of main arguments
 
+#if INCLUDE_JVMCI
+
+// Check consistency of jvmci vm argument settings.
+bool Arguments::check_jvmci_args_consistency() {
+ 
+
+  if (!EnableJVMCI && is_any_jvmci_arg_values_changed()) { 
+    print_jvmci_arg_inconsistency_error_message(); 
+    return false;
+  }
+  return true;
+}
+#endif //INCLUDE_JVMCI
+
 // Check consistency of GC selection
 bool Arguments::check_gc_consistency() {
   // Ensure that the user has not selected conflicting sets
@@ -2408,6 +2422,9 @@
 #endif
   }
 #if INCLUDE_JVMCI
+
+  status = status && check_jvmci_args_consistency();
+
   if (EnableJVMCI) {
     if (!ScavengeRootsInCode) {
       warning("forcing ScavengeRootsInCode non-zero because JVMCI is enabled");