|
31 | 31 | #include "classfile/stackMapTableFormat.hpp"
|
32 | 32 | #include "classfile/symbolTable.hpp"
|
33 | 33 | #include "classfile/systemDictionary.hpp"
|
34 |
| -#include "classfile/systemDictionaryShared.hpp" |
35 | 34 | #include "classfile/verifier.hpp"
|
36 | 35 | #include "classfile/vmClasses.hpp"
|
37 | 36 | #include "classfile/vmSymbols.hpp"
|
|
60 | 59 | #include "services/threadService.hpp"
|
61 | 60 | #include "utilities/align.hpp"
|
62 | 61 | #include "utilities/bytes.hpp"
|
| 62 | +#if INCLUDE_CDS |
| 63 | +#include "classfile/systemDictionaryShared.hpp" |
| 64 | +#endif |
63 | 65 |
|
64 | 66 | #define NOFAILOVER_MAJOR_VERSION 51
|
65 | 67 | #define NONZERO_PADDING_BYTES_IN_SWITCH_MAJOR_VERSION 51
|
@@ -234,11 +236,13 @@ bool Verifier::verify(InstanceKlass* klass, bool should_verify_class, TRAPS) {
|
234 | 236 | exception_name == vmSymbols::java_lang_ClassFormatError())) {
|
235 | 237 | log_info(verification)("Fail over class verification to old verifier for: %s", klass->external_name());
|
236 | 238 | log_info(class, init)("Fail over class verification to old verifier for: %s", klass->external_name());
|
| 239 | +#if INCLUDE_CDS |
237 | 240 | // Exclude any classes that fail over during dynamic dumping
|
238 | 241 | if (CDSConfig::is_dumping_dynamic_archive()) {
|
239 | 242 | SystemDictionaryShared::warn_excluded(klass, "Failed over class verification while dynamic dumping");
|
240 | 243 | SystemDictionaryShared::set_excluded(klass);
|
241 | 244 | }
|
| 245 | +#endif |
242 | 246 | message_buffer = NEW_RESOURCE_ARRAY(char, message_buffer_len);
|
243 | 247 | exception_message = message_buffer;
|
244 | 248 | exception_name = inference_verify(
|
|
0 commit comments