Skip to content

Commit 8f75619

Browse files
committed
8340864: Remove unused lines related to vmClasses
Reviewed-by: shade, kvn
1 parent 84751cb commit 8f75619

File tree

3 files changed

+1
-20
lines changed

3 files changed

+1
-20
lines changed

src/hotspot/share/classfile/systemDictionary.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -293,13 +293,6 @@ class SystemDictionary : AllStatic {
293293
const char* message);
294294
static const char* find_nest_host_error(const constantPoolHandle& pool, int which);
295295

296-
protected:
297-
static InstanceKlass* _well_known_klasses[];
298-
299-
private:
300-
// table of box klasses (int_klass, etc.)
301-
static InstanceKlass* _box_klasses[T_VOID+1];
302-
303296
static OopHandle _java_system_loader;
304297
static OopHandle _java_platform_loader;
305298

src/hotspot/share/classfile/vmClasses.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,6 @@ InstanceKlass* vmClasses::_klasses[static_cast<int>(vmClassID::LIMIT)]
4545
= { nullptr /*, nullptr...*/ };
4646
InstanceKlass* vmClasses::_box_klasses[T_VOID+1] = { nullptr /*, nullptr...*/ };
4747

48-
49-
// CDS: scan and relocate all classes referenced by _klasses[].
50-
void vmClasses::metaspace_pointers_do(MetaspaceClosure* it) {
51-
for (auto id : EnumRange<vmClassID>{}) {
52-
it->push(klass_addr_at(id));
53-
}
54-
}
55-
5648
bool vmClasses::is_loaded(InstanceKlass* klass) {
5749
return klass != nullptr && klass->is_loaded();
5850
}
@@ -205,8 +197,6 @@ void vmClasses::resolve_all(TRAPS) {
205197
_box_klasses[T_SHORT] = vmClasses::Short_klass();
206198
_box_klasses[T_INT] = vmClasses::Integer_klass();
207199
_box_klasses[T_LONG] = vmClasses::Long_klass();
208-
//_box_klasses[T_OBJECT] = vmClasses::object_klass();
209-
//_box_klasses[T_ARRAY] = vmClasses::object_klass();
210200

211201
#ifdef ASSERT
212202
if (CDSConfig::is_using_archive()) {

src/hotspot/share/classfile/vmClasses.hpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2021, 2024, 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
@@ -32,7 +32,6 @@
3232

3333
class ClassLoaderData;
3434
class InstanceKlass;
35-
class MetaspaceClosure;
3635

3736
class vmClasses : AllStatic {
3837
friend class VMStructs;
@@ -95,7 +94,6 @@ class vmClasses : AllStatic {
9594
return &_klasses[as_int(id)];
9695
}
9796

98-
static void metaspace_pointers_do(MetaspaceClosure* it);
9997
static void resolve_all(TRAPS);
10098

10199
static BasicType box_klass_type(Klass* k); // inverse of box_klass

0 commit comments

Comments
 (0)