Merge pull request #5543 from jason-hall/getContractionSize

Fix 0 getContractionSize() in MemorySubSpaceGenerational
eclipse-omr · Jan 6, 2021 · 9ed05d5 · 9ed05d5
2 parents 814cc0e + c6f0224
commit 9ed05d5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/gc/base/MemorySubSpace.hpp b/gc/base/MemorySubSpace.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 1991, 2020 IBM Corp. and others
+ * Copyright (c) 1991, 2021 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -180,7 +180,7 @@ friend class GC_MemorySubSpaceRegionIterator;
 	MMINLINE void isAllocatable(bool isAllocatable) {_isAllocatable = isAllocatable; }
 	MMINLINE bool isAllocatable() { return _isAllocatable; }
 
-	MMINLINE uintptr_t getContractionSize() const { return _contractionSize; }
+	virtual MMINLINE uintptr_t getContractionSize() const { return _contractionSize; }
 	MMINLINE uintptr_t getExpansionSize() const { return _expansionSize; }
 	MMINLINE void setContractionSize(uintptr_t size) { _contractionSize = size; }
 	MMINLINE void setExpansionSize(uintptr_t size) { _expansionSize = size; }

diff --git a/gc/base/MemorySubSpaceGenerational.hpp b/gc/base/MemorySubSpaceGenerational.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 1991, 2015 IBM Corp. and others
+ * Copyright (c) 1991, 2021 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -109,6 +109,8 @@ class MM_MemorySubSpaceGenerational : public MM_MemorySubSpace
 	virtual uintptr_t releaseFreeMemoryPages(MM_EnvironmentBase* env);
 #endif
 
+	virtual MMINLINE uintptr_t getContractionSize() const { return _memorySubSpaceOld->getContractionSize(); }
+
 	/**
 	 * Create a MemorySubSpaceGenerational object.
 	 */