Skip to content

Commit 1eed4ba

Browse files
theaoqiPaul Hohensee
authored and
Paul Hohensee
committed
8350499: Minimal build fails with slowdebug builds
Backport-of: 302bed055c3b4881f97c584d5953273b9dbc2969
1 parent ef35e66 commit 1eed4ba

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
@@ -32,7 +32,6 @@
3232
#include "classfile/stackMapTableFormat.hpp"
3333
#include "classfile/symbolTable.hpp"
3434
#include "classfile/systemDictionary.hpp"
35-
#include "classfile/systemDictionaryShared.hpp"
3635
#include "classfile/verifier.hpp"
3736
#include "classfile/vmClasses.hpp"
3837
#include "classfile/vmSymbols.hpp"
@@ -61,6 +60,9 @@
6160
#include "services/threadService.hpp"
6261
#include "utilities/align.hpp"
6362
#include "utilities/bytes.hpp"
63+
#if INCLUDE_CDS
64+
#include "classfile/systemDictionaryShared.hpp"
65+
#endif
6466

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

0 commit comments

Comments
 (0)