Skip to content

Commit 302bed0

Browse files
theaoqiDavid Holmes
authored and
David Holmes
committed
8350499: Minimal build fails with slowdebug builds
Reviewed-by: kbarrett, dholmes
1 parent 0795d11 commit 302bed0

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/hotspot/share/classfile/verifier.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "classfile/stackMapTableFormat.hpp"
3232
#include "classfile/symbolTable.hpp"
3333
#include "classfile/systemDictionary.hpp"
34-
#include "classfile/systemDictionaryShared.hpp"
3534
#include "classfile/verifier.hpp"
3635
#include "classfile/vmClasses.hpp"
3736
#include "classfile/vmSymbols.hpp"
@@ -60,6 +59,9 @@
6059
#include "services/threadService.hpp"
6160
#include "utilities/align.hpp"
6261
#include "utilities/bytes.hpp"
62+
#if INCLUDE_CDS
63+
#include "classfile/systemDictionaryShared.hpp"
64+
#endif
6365

6466
#define NOFAILOVER_MAJOR_VERSION 51
6567
#define NONZERO_PADDING_BYTES_IN_SWITCH_MAJOR_VERSION 51
@@ -234,11 +236,13 @@ bool Verifier::verify(InstanceKlass* klass, bool should_verify_class, TRAPS) {
234236
exception_name == vmSymbols::java_lang_ClassFormatError())) {
235237
log_info(verification)("Fail over class verification to old verifier for: %s", klass->external_name());
236238
log_info(class, init)("Fail over class verification to old verifier for: %s", klass->external_name());
239+
#if INCLUDE_CDS
237240
// Exclude any classes that fail over during dynamic dumping
238241
if (CDSConfig::is_dumping_dynamic_archive()) {
239242
SystemDictionaryShared::warn_excluded(klass, "Failed over class verification while dynamic dumping");
240243
SystemDictionaryShared::set_excluded(klass);
241244
}
245+
#endif
242246
message_buffer = NEW_RESOURCE_ARRAY(char, message_buffer_len);
243247
exception_message = message_buffer;
244248
exception_name = inference_verify(

0 commit comments

Comments
 (0)