8361101: AOTCodeAddressTable::_stubs_addr not initialized/freed properly

Ashutosh Mehra · Ashutosh Mehra · commit ab013962093a · 2025-07-02T17:49:52.000Z
Reviewed-by: shade Backport-of: 3066a67
diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp
@@ -1438,6 +1438,9 @@ AOTCodeAddressTable::~AOTCodeAddressTable() {
   if (_extrs_addr != nullptr) {
     FREE_C_HEAP_ARRAY(address, _extrs_addr);
   }
+  if (_stubs_addr != nullptr) {
+    FREE_C_HEAP_ARRAY(address, _stubs_addr);
+  }
   if (_shared_blobs_addr != nullptr) {
     FREE_C_HEAP_ARRAY(address, _shared_blobs_addr);
   }
diff --git a/src/hotspot/share/code/aotCodeCache.hpp b/src/hotspot/share/code/aotCodeCache.hpp
@@ -136,6 +136,7 @@ class AOTCodeAddressTable : public CHeapObj<mtCode> {
 public:
   AOTCodeAddressTable() :
     _extrs_addr(nullptr),
+    _stubs_addr(nullptr),
     _shared_blobs_addr(nullptr),
     _C1_blobs_addr(nullptr),
     _extrs_length(0),

Original file line number	Diff line number	Diff line change
`@@ -1438,6 +1438,9 @@ AOTCodeAddressTable::~AOTCodeAddressTable() {`
`1438`	`1438`	`if (_extrs_addr != nullptr) {`
`1439`	`1439`	`FREE_C_HEAP_ARRAY(address, _extrs_addr);`
`1440`	`1440`	`}`
	`1441`	`+ if (_stubs_addr != nullptr) {`
	`1442`	`+ FREE_C_HEAP_ARRAY(address, _stubs_addr);`
	`1443`	`+ }`
`1441`	`1444`	`if (_shared_blobs_addr != nullptr) {`
`1442`	`1445`	`FREE_C_HEAP_ARRAY(address, _shared_blobs_addr);`
`1443`	`1446`	`}`