resolve conflicts openjdk#1

LizBing · Dec 1, 2023 · 4a28d0e · 4a28d0e
1 parent 12c680a
commit 4a28d0e
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 145 deletions.
diff --git a/src/hotspot/share/gc/serial/generation.hpp b/src/hotspot/share/gc/serial/generation.hpp
@@ -50,7 +50,6 @@
 
 class DefNewGeneration;
 class GCMemoryManager;
-class GenerationSpec;
 class ContiguousSpace;
 class CompactPoint;
 class OopClosure;

diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -94,14 +94,6 @@ SerialHeap::SerialHeap() :
  CollectedHeap(),
  _young_gen(nullptr),
  _old_gen(nullptr),
- _young_gen_spec(new GenerationSpec(Generation::DefNew,
- NewSize,
- MaxNewSize,
- GenAlignment)),
- _old_gen_spec(new GenerationSpec(Generation::MarkSweepCompact,
- OldSize,
- MaxOldSize,
- GenAlignment)),
  _rem_set(nullptr),
  _soft_ref_policy(),
  _gc_policy_counters(new GCPolicyCounters("Copy:MSC", 2, 2)),
@@ -302,14 +294,6 @@ PreGenGCValues SerialHeap::get_pre_gc_values() const {
  old_gen()->capacity());
 }
 
-GenerationSpec* SerialHeap::young_gen_spec() const {
- return _young_gen_spec;
-}
-
-GenerationSpec* SerialHeap::old_gen_spec() const {
- return _old_gen_spec;
-}
-
 size_t SerialHeap::capacity() const {
  return _young_gen->capacity() + _old_gen->capacity();
 }

diff --git a/src/hotspot/share/gc/serial/serialHeap.hpp b/src/hotspot/share/gc/serial/serialHeap.hpp
@@ -36,7 +36,6 @@
 
 class CardTableRS;
 class GCPolicyCounters;
-class GenerationSpec;
 
 class GCMemoryManager;
 class MemoryPool;
@@ -86,9 +85,6 @@ class SerialHeap : public CollectedHeap {
  TenuredGeneration* _old_gen;
 
 private:
- GenerationSpec* _young_gen_spec;
- GenerationSpec* _old_gen_spec;
-
  // The singleton CardTable Remembered Set.
  CardTableRS* _rem_set;
 
@@ -159,9 +155,6 @@ class SerialHeap : public CollectedHeap {
  MemRegion reserved_region() const { return _reserved; }
  bool is_in_reserved(const void* addr) const { return _reserved.contains(addr); }
 
- GenerationSpec* young_gen_spec() const;
- GenerationSpec* old_gen_spec() const;
-
  SoftRefPolicy* soft_ref_policy() override { return &_soft_ref_policy; }
 
  // Performance Counter support

diff --git a/src/hotspot/share/gc/serial/vmStructs_serial.hpp b/src/hotspot/share/gc/serial/vmStructs_serial.hpp
@@ -57,8 +57,6 @@
  \
  nonstatic_field(SerialHeap, _young_gen, DefNewGeneration*) \
  nonstatic_field(SerialHeap, _old_gen, TenuredGeneration*) \
- nonstatic_field(SerialHeap, _young_gen_spec, GenerationSpec*) \
- nonstatic_field(SerialHeap, _old_gen_spec, GenerationSpec*) \
 
 #define VM_TYPES_SERIALGC(declare_type, \
  declare_toplevel_type, \

diff --git a/src/hotspot/share/gc/shared/generationSpec.cpp b/src/hotspot/share/gc/shared/generationSpec.cpp
diff --git a/src/hotspot/share/gc/shared/generationSpec.hpp b/src/hotspot/share/gc/shared/generationSpec.hpp
diff --git a/src/hotspot/share/gc/shared/vmStructs_gc.hpp b/src/hotspot/share/gc/shared/vmStructs_gc.hpp
@@ -28,7 +28,6 @@
 #include "gc/shared/ageTable.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/collectedHeap.hpp"
-#include "gc/shared/generationSpec.hpp"
 #include "gc/shared/oopStorage.hpp"
 #include "gc/shared/space.hpp"
 #if INCLUDE_EPSILONGC
@@ -113,10 +112,6 @@
  nonstatic_field(Generation::StatRecord, invocations, int) \
  nonstatic_field(Generation::StatRecord, accumulated_time, elapsedTimer) \
  \
- nonstatic_field(GenerationSpec, _name, Generation::Name) \
- nonstatic_field(GenerationSpec, _init_size, size_t) \
- nonstatic_field(GenerationSpec, _max_size, size_t) \
- \
  nonstatic_field(MemRegion, _start, HeapWord*) \
  nonstatic_field(MemRegion, _word_size, size_t) \
  \
@@ -165,7 +160,6 @@
  declare_toplevel_type(AgeTable) \
  declare_toplevel_type(CardTable::CardValue) \
  declare_toplevel_type(Generation::StatRecord) \
- declare_toplevel_type(GenerationSpec) \
  declare_toplevel_type(HeapWord) \
  declare_toplevel_type(MemRegion) \
  declare_toplevel_type(ThreadLocalAllocBuffer) \
@@ -182,7 +176,6 @@
  declare_toplevel_type(ContiguousSpace*) \
  declare_toplevel_type(DefNewGeneration*) \
  declare_toplevel_type(Generation*) \
- declare_toplevel_type(GenerationSpec**) \
  declare_toplevel_type(HeapWord*) \
  declare_toplevel_type(HeapWord* volatile) \
  declare_toplevel_type(MemRegion*) \