Merge pull request #8309 from The-OpenROAD-Project-staging/cugr-coverity

grt: cleanup some Coverity issues in cugr

Author: maliberty

src/grt/src/cugr/src/Layers.cpp

@@ -67,16 +67,17 @@ MetalLayer::MetalLayer(odb::dbTechLayer* tech_layer,
     const int spacing = static_cast<int>(std::round(rule->getSpacing()));
     uint eol_width, eol_within, parallel_space, parallel_within;
     bool parallel_edge, two_edges;
-    rule->getEol(eol_width,
-                 eol_within,
-                 parallel_edge,
-                 parallel_space,
-                 parallel_within,
-                 two_edges);
-    // Pessimistic
-    max_eol_spacing_ = std::max(max_eol_spacing_, spacing);
-    max_eol_width_ = std::max(max_eol_width_, static_cast<int>(eol_width));
-    max_eol_within_ = std::max(max_eol_within_, static_cast<int>(eol_within));
+    if (rule->getEol(eol_width,
+                     eol_within,
+                     parallel_edge,
+                     parallel_space,
+                     parallel_within,
+                     two_edges)) {
+      // Pessimistic
+      max_eol_spacing_ = std::max(max_eol_spacing_, spacing);
+      max_eol_width_ = std::max(max_eol_width_, static_cast<int>(eol_width));
+      max_eol_within_ = std::max(max_eol_within_, static_cast<int>(eol_within));
+    }
   }
 }
 

src/grt/src/cugr/src/MazeRoute.cpp

@@ -197,7 +197,7 @@ void MazeRoute::run()
       queue.pop();
       foundPinIndex = graph_.getVertexPin(solution->vertex);
       if (foundPinIndex != -1 && !visited[foundPinIndex]) {
-        foundSolution = solution;
+        foundSolution = std::move(solution);
         break;
       }
       // Pruning
@@ -221,11 +221,12 @@ void MazeRoute::run()
     }
 
     solutions_.emplace_back(foundSolution);
+    assert(foundPinIndex >= 0);
     visited[foundPinIndex] = true;
     numDetached -= 1;
 
     // Update the cost of the vertices_ on the path
-    std::shared_ptr<Solution> temp = foundSolution;
+    std::shared_ptr<Solution> temp = std::move(foundSolution);
     while (temp && temp->cost != 0) {
       updateSolution(std::make_shared<Solution>(0, temp->vertex, temp->prev));
       temp = temp->prev;
@@ -255,7 +256,7 @@ std::shared_ptr<SteinerTreeNode> MazeRoute::getSteinerTree() const
       auto it = created.find(temp->vertex);
       if (it == created.end()) {
         const PointT point = graph_.getPoint(temp->vertex);
-        const auto node = std::make_shared<SteinerTreeNode>(point);
+        auto node = std::make_shared<SteinerTreeNode>(point);
         created.emplace(temp->vertex, node);
         if (lastNode) {
           node->addChild(lastNode);
@@ -269,7 +270,7 @@ std::shared_ptr<SteinerTreeNode> MazeRoute::getSteinerTree() const
           assert(pinIndex != -1);
           node->setFixedLayers(graph_.getPseudoPin(pinIndex).second);
         }
-        lastNode = node;
+        lastNode = std::move(node);
         temp = temp->prev;
       } else {
         if (lastNode) {
@@ -279,6 +280,7 @@ std::shared_ptr<SteinerTreeNode> MazeRoute::getSteinerTree() const
       }
     }
   }
+  assert(tree);
 
   // Remove redundant tree nodes
   SteinerTreeNode::preorder(
@@ -317,7 +319,7 @@ std::shared_ptr<SteinerTreeNode> MazeRoute::getSteinerTree() const
                         == (*(temp->getChildren()[0]))[1 - direction]) {
             temp = temp->getChildren()[0];
           }
-          child = temp;
+          child = std::move(temp);
         }
       });
 

src/grt/src/cugr/src/PatternRoute.cpp

@@ -145,7 +145,7 @@ void PatternRoute::constructSteinerTree()
           }
           // Connect current to parent
           if (parent == nullptr) {
-            parent = current;
+            parent = std::move(current);
           } else {
             parent->addChild(current);
           }
@@ -186,7 +186,7 @@ void PatternRoute::constructRoutingDAG()
           constructDag(current, steinerChild);
         }
         if (dstNode == nullptr) {
-          dstNode = current;
+          dstNode = std::move(current);
         } else {
           dstNode->addChild(current);
           constructPaths(dstNode, current);
@@ -216,7 +216,7 @@ void PatternRoute::constructPaths(std::shared_ptr<PatternRoutingNode>& start,
           = std::make_shared<PatternRoutingNode>(
               midPoint, num_dag_nodes_++, true);
       mid->getPaths() = {{end}};
-      childPaths.push_back(mid);
+      childPaths.push_back(std::move(mid));
     }
   }
 }
@@ -637,6 +637,7 @@ std::shared_ptr<GRTreeNode> PatternRoute::getRoutingTree(
       }
     }
   }
+  assert(parentLayerIndex >= 0);
   std::shared_ptr<GRTreeNode> routingNode
       = std::make_shared<GRTreeNode>(parentLayerIndex, node->x(), node->y());
   std::shared_ptr<GRTreeNode> lowestRoutingNode = routingNode;