Skip to content

Commit 910dffe

Browse files
committed
8292635: Run ArchivedEnumTest.java in jdk tier testing
Reviewed-by: iklam, dholmes
1 parent fc9f8ba commit 910dffe

File tree

5 files changed

+4
-5
lines changed

5 files changed

+4
-5
lines changed

src/hotspot/share/cds/cdsHeapVerifier.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -308,11 +308,9 @@ int CDSHeapVerifier::trace_to_root(outputStream* st, oop orig_obj, oop orig_fiel
308308
return level;
309309
}
310310

311-
#ifdef ASSERT
312311
void CDSHeapVerifier::verify() {
313312
CDSHeapVerifier verf;
314313
HeapShared::archived_object_cache()->iterate(&verf);
315314
}
316-
#endif
317315

318316
#endif // INCLUDE_CDS_JAVA_HEAP

src/hotspot/share/cds/cdsHeapVerifier.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -82,7 +82,7 @@ class CDSHeapVerifier : public KlassClosure {
8282
// For ResourceHashtable::iterate()
8383
inline bool do_entry(oop& orig_obj, HeapShared::CachedOopInfo& value);
8484

85-
static void verify() NOT_DEBUG_RETURN;
85+
static void verify();
8686

8787
static void trace_to_root(outputStream* st, oop orig_obj);
8888
};

test/jdk/TEST.ROOT

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ requires.properties= \
6060
vm.compiler1.enabled \
6161
vm.compiler2.enabled \
6262
vm.cds \
63+
vm.cds.write.archived.java.heap \
6364
vm.continuations \
6465
vm.musl \
6566
vm.debug \

0 commit comments

Comments
 (0)