--- a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp	Wed Oct 02 13:57:03 2019 -0400
+++ b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp	Wed Oct 02 16:55:08 2019 -0700
@@ -168,7 +168,7 @@
 
 static bool is_cds_dump_requested() {
   // we will not be able to launch recordings if a cds dump is being requested
-  if ((DumpSharedSpaces || DynamicDumpSharedSpaces) && (JfrOptionSet::startup_recording_options() != NULL)) {
+  if (Arguments::is_dumping_archive() && (JfrOptionSet::startup_recording_options() != NULL)) {
     warning("JFR will be disabled during CDS dumping");
     teardown_startup_support();
     return true;