Skip to content

Commit dfd3832

Browse files
fandreuzalbertnetymk
authored andcommitted
8368966: Remove spurious VMStructs friends
Reviewed-by: stefank, ayang
1 parent 5251405 commit dfd3832

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2
-79
lines changed

src/hotspot/share/ci/ciObjectFactory.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
// which ensures that for each oop, at most one ciObject is created.
3838
// This invariant allows efficient implementation of ciObject.
3939
class ciObjectFactory : public ArenaObj {
40-
friend class VMStructs;
4140
friend class ciEnv;
4241

4342
private:

src/hotspot/share/classfile/compactHashtable.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ template <
254254
bool (*EQUALS)(V value, K key, int len)
255255
>
256256
class CompactHashtable : public SimpleCompactHashtable {
257-
friend class VMStructs;
258257

259258
V decode(u4 encoded_value) const {
260259
return DECODE(_base_address, encoded_value);

src/hotspot/share/code/codeBlob.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,6 @@ class CodeBlob {
325325
// RuntimeBlob: used for non-compiled method code (adapters, stubs, blobs)
326326

327327
class RuntimeBlob : public CodeBlob {
328-
friend class VMStructs;
329328
public:
330329

331330
// Creation
@@ -634,7 +633,6 @@ class DeoptimizationBlob: public SingletonBlob {
634633
#ifdef COMPILER2
635634

636635
class UncommonTrapBlob: public SingletonBlob {
637-
friend class VMStructs;
638636
private:
639637
// Creation support
640638
UncommonTrapBlob(
@@ -658,7 +656,6 @@ class UncommonTrapBlob: public SingletonBlob {
658656
// ExceptionBlob: used for exception unwinding in compiled code (currently only used by Compiler 2)
659657

660658
class ExceptionBlob: public SingletonBlob {
661-
friend class VMStructs;
662659
private:
663660
// Creation support
664661
ExceptionBlob(
@@ -695,7 +692,6 @@ class ExceptionBlob: public SingletonBlob {
695692
// SafepointBlob: handles illegal_instruction exceptions during a safepoint
696693

697694
class SafepointBlob: public SingletonBlob {
698-
friend class VMStructs;
699695
private:
700696
// Creation support
701697
SafepointBlob(

src/hotspot/share/code/dependencyContext.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ class DepChange;
4242
// finding nmethods which might need to be deoptimized.
4343
//
4444
class nmethodBucket: public CHeapObj<mtClass> {
45-
friend class VMStructs;
4645
private:
4746
nmethod* _nmethod;
4847
nmethodBucket* volatile _next;
@@ -68,7 +67,6 @@ class nmethodBucket: public CHeapObj<mtClass> {
6867
// and uint64_t integer recording the safepoint counter at the last cleanup.
6968
//
7069
class DependencyContext : public StackObj {
71-
friend class VMStructs;
7270
friend class TestDependencyContext;
7371
private:
7472
nmethodBucket* volatile* _dependency_context_addr;

src/hotspot/share/code/nmethod.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ class ExceptionCache : public CHeapObj<mtCode> {
9090

9191
// cache pc descs found in earlier inquiries
9292
class PcDescCache {
93-
friend class VMStructs;
9493
private:
9594
enum { cache_size = 4 };
9695
// The array elements MUST be volatile! Several threads may modify

src/hotspot/share/compiler/abstractCompiler.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ typedef void (*initializer)(void);
3333

3434
// Per-compiler statistics
3535
class CompilerStatistics {
36-
friend class VMStructs;
37-
3836
class Data {
3937
friend class VMStructs;
4038
public:

src/hotspot/share/compiler/oopMap.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,6 @@ class OopMapDo {
479479
// pointers are updated based on their base pointers new value and an offset.
480480
#if COMPILER2_OR_JVMCI
481481
class DerivedPointerTable : public AllStatic {
482-
friend class VMStructs;
483482
private:
484483
class Entry;
485484
static bool _active; // do not record pointers for verify pass etc.

src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
// No interaction with application is required for Epsilon, and therefore
3131
// the barrier set is empty.
3232
class EpsilonBarrierSet: public BarrierSet {
33-
friend class VMStructs;
34-
3533
public:
3634
EpsilonBarrierSet();
3735

src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
#include "services/memoryService.hpp"
3333

3434
class EpsilonSpaceCounters: public CHeapObj<mtGC> {
35-
friend class VMStructs;
36-
3735
private:
3836
PerfVariable* _capacity;
3937
PerfVariable* _used;

src/hotspot/share/gc/g1/g1Allocator.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ class G1NUMA;
3737
// some accessors (e.g. allocating into them, or getting their occupancy).
3838
// Also keeps track of retained regions across GCs.
3939
class G1Allocator : public CHeapObj<mtGC> {
40-
friend class VMStructs;
41-
4240
private:
4341
G1CollectedHeap* _g1h;
4442
G1NUMA* _numa;

0 commit comments

Comments
 (0)