--- a/hotspot/src/share/vm/runtime/arguments.cpp	Wed Jul 05 22:21:06 2017 +0200
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Thu May 12 17:37:45 2016 -0400
@@ -3899,6 +3899,13 @@
 
 void Arguments::set_shared_spaces_flags() {
   if (DumpSharedSpaces) {
+    if (FailOverToOldVerifier) {
+      // Don't fall back to the old verifier on verification failure. If a
+      // class fails verification with the split verifier, it might fail the
+      // CDS runtime verifier constraint check. In that case, we don't want
+      // to share the class. We only archive classes that pass the split verifier.
+      FLAG_SET_DEFAULT(FailOverToOldVerifier, false);
+    }
 
     if (RequireSharedSpaces) {
       warning("Cannot dump shared archive while using shared archive");