Merge pull request #8786 from The-OpenROAD-Project-staging/dpl-asan

dpl: fix small memory leaks

Author: maliberty

src/dpl/include/dpl/Opendp.h

@@ -147,7 +147,7 @@ class Opendp
 
   using MasterByImplant = std::map<odb::dbTechLayer*, dbMasterSeq>;
 
-  using YCoordToGap = std::map<DbuY, std::vector<GapInfo*>>;
+  using YCoordToGap = std::map<DbuY, std::vector<std::unique_ptr<GapInfo>>>;
 
   friend class OpendpTest_IsPlaced_Test;
   friend class Graphics;
@@ -290,7 +290,7 @@ class Opendp
   void insertDecapInPos(odb::dbMaster* master,
                         const DbuX& pos_x,
                         const DbuY& pos_y);
-  void insertDecapInRow(const std::vector<GapInfo*>& gaps,
+  void insertDecapInRow(const std::vector<std::unique_ptr<GapInfo>>& gaps,
                         DbuY gap_y,
                         DbuX irdrop_x,
                         DbuY irdrop_y,
@@ -333,7 +333,7 @@ class Opendp
   bool have_fillers_ = false;
 
   // Decap placement.
-  std::vector<DecapCell*> decap_masters_;
+  std::vector<std::unique_ptr<DecapCell>> decap_masters_;
   int decap_count_ = 0;
   YCoordToGap gaps_;
 

src/dpl/src/DecapPlacement.cpp

@@ -3,6 +3,7 @@
 
 #include <algorithm>
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -83,7 +84,8 @@ void Opendp::prepareDecapAndGaps()
   // Sort decaps cells in descending order
   std::sort(decap_masters_.begin(),
             decap_masters_.end(),
-            [](const DecapCell* decap1, const DecapCell* decap2) {
+            [](const std::unique_ptr<DecapCell>& decap1,
+               const std::unique_ptr<DecapCell>& decap2) {
               return decap1->capacitance > decap2->capacitance;
             });
 
@@ -92,11 +94,11 @@ void Opendp::prepareDecapAndGaps()
   int gaps_count = 0;
   // Sort each gap vector for X position
   for (auto& it : gaps_) {
-    std::sort(it.second.begin(),
-              it.second.end(),
-              [](const GapInfo* gap1, const GapInfo* gap2) {
-                return gap1->x < gap2->x;
-              });
+    std::sort(
+        it.second.begin(),
+        it.second.end(),
+        [](const std::unique_ptr<GapInfo>& gap1,
+           const std::unique_ptr<GapInfo>& gap2) { return gap1->x < gap2->x; });
     gaps_count += it.second.size();
   }
 
@@ -166,19 +168,20 @@ void Opendp::insertDecapCells(const double target, IRDropByPoint& psm_ir_drops)
                 total_cap);
 }
 
-void Opendp::insertDecapInRow(const std::vector<GapInfo*>& gaps,
+void Opendp::insertDecapInRow(const std::vector<std::unique_ptr<GapInfo>>& gaps,
                               const DbuY gap_y,
                               const DbuX irdrop_x,
                               const DbuY irdrop_y,
                               double& total,
                               const double& target)
 {
   // Find gap in same row and x near the ir drop
-  auto find_gap = std::lower_bound(
-      gaps.begin(),
-      gaps.end(),
-      irdrop_x,
-      [](const GapInfo* elem, const DbuX& value) { return elem->x < value; });
+  auto find_gap
+      = std::lower_bound(gaps.begin(),
+                         gaps.end(),
+                         irdrop_x,
+                         [](const std::unique_ptr<GapInfo>& elem,
+                            const DbuX& value) { return elem->x < value; });
   // if this row has free gap with x <= xpoint <= x + width
   if (find_gap != gaps.end()
       && ((*find_gap)->x + (*find_gap)->width) >= irdrop_x

src/dpl/src/Opendp.cpp

@@ -18,6 +18,7 @@
 #include "dpl/OptMirror.h"
 #include "graphics/DplObserver.h"
 #include "infrastructure/Coordinates.h"
+#include "infrastructure/DecapObjects.h"
 #include "infrastructure/Grid.h"
 #include "infrastructure/Objects.h"
 #include "infrastructure/Padding.h"