Skip to content

Commit 313e7ea

Browse files
authored
Merge pull request The-OpenROAD-Project#8330 from The-OpenROAD-Project-staging/odb-defout-coverity
odb: fix Coverity warnings in defout
2 parents d1abc18 + dccae31 commit 313e7ea

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

src/odb/src/defout/defout_impl.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,7 @@ void DefOut::Impl::writeRegions(dbBlock* block)
763763
*_out << " ( " << defdist(box->xMin()) << " " << defdist(box->yMin())
764764
<< " ) ( " << defdist(box->xMax()) << " " << defdist(box->yMax())
765765
<< " )";
766+
++cnt;
766767
}
767768

768769
switch ((dbRegionType::Value) region->getRegionType()) {
@@ -1035,25 +1036,24 @@ void DefOut::Impl::writeBPin(dbBPin* bpin, int cnt)
10351036
*_out << " + LAYER " << lname << " ( " << xMin << " " << yMin << " ) ( "
10361037
<< xMax << " " << yMax << " )";
10371038
} else {
1038-
std::string layer_name = lname;
10391039
if (_version == DefOut::DEF_5_8) {
10401040
uint mask = box->getLayerMask();
10411041
if (mask != 0) {
10421042
// add mask information to layer name
1043-
layer_name += " MASK " + std::to_string(mask);
1043+
lname += " MASK " + std::to_string(mask);
10441044
}
10451045
}
10461046
if (bpin->hasEffectiveWidth()) {
10471047
int w = defdist(bpin->getEffectiveWidth());
1048-
*_out << " + LAYER " << layer_name << " DESIGNRULEWIDTH " << w << " ( "
1048+
*_out << " + LAYER " << lname << " DESIGNRULEWIDTH " << w << " ( "
10491049
<< xMin << " " << yMin << " ) ( " << xMax << " " << yMax << " )";
10501050
} else if (bpin->hasMinSpacing()) {
10511051
int s = defdist(bpin->getMinSpacing());
1052-
*_out << " + LAYER " << layer_name << " SPACING " << s << " ( " << xMin
1052+
*_out << " + LAYER " << lname << " SPACING " << s << " ( " << xMin
10531053
<< " " << yMin << " ) ( " << xMax << " " << yMax << " )";
10541054
} else {
1055-
*_out << " + LAYER " << layer_name << " ( " << xMin << " " << yMin
1056-
<< " ) ( " << xMax << " " << yMax << " )";
1055+
*_out << " + LAYER " << lname << " ( " << xMin << " " << yMin << " ) ( "
1056+
<< xMax << " " << yMax << " )";
10571057
}
10581058
}
10591059
}
@@ -2068,6 +2068,7 @@ void DefOut::Impl::writeProperties(dbObject* object)
20682068
std::string name = prop->getName();
20692069
*_out << name << " ";
20702070
writePropValue(prop);
2071+
++cnt;
20712072
}
20722073
}
20732074

src/odb/test/def_parser.defok

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,12 @@ NONDEFAULTRULES 1 ;
9090
+ VIA M3_M2_via
9191
+ VIARULE M2_M1
9292
+ MINCUTS via1 2
93-
+ PROPERTY strprop "aString" intprop 1 realprop 1.1 intrangeprop 25 realrangeprop 25.25 ;
93+
+ PROPERTY strprop "aString" intprop 1 realprop 1.1 intrangeprop 25
94+
realrangeprop 25.25 ;
9495
END NONDEFAULTRULES
9596
REGIONS 2 ;
96-
- region1 ( -500 -500 ) ( 300 100 ) ( 500 500 ) ( 1000 1000 ) + TYPE FENCE + PROPERTY strprop "aString" intprop 1 realprop 1.1 intrangeprop 25 realrangeprop 25.25 ;
97+
- region1 ( -500 -500 ) ( 300 100 ) ( 500 500 ) ( 1000 1000 ) + TYPE FENCE + PROPERTY strprop "aString" intprop 1 realprop 1.1 intrangeprop 25
98+
realrangeprop 25.25 ;
9799
- region2 ( 4000 0 ) ( 5000 1000 ) + TYPE GUIDE ;
98100
END REGIONS
99101
COMPONENTS 12 ;
@@ -186,6 +188,7 @@ NETS 24 ;
186188
- out[8] ( PIN out[8] ) ( _d8_ Q ) + USE SIGNAL ;
187189
END NETS
188190
GROUPS 1 ;
189-
- group1 _d0_ _g0_ + REGION region1 + PROPERTY strprop "aString" intprop 1 realprop 1.1 intrangeprop 25 realrangeprop 25.25 ;
191+
- group1 _d0_ _g0_ + REGION region1 + PROPERTY strprop "aString" intprop 1 realprop 1.1 intrangeprop 25
192+
realrangeprop 25.25 ;
190193
END GROUPS
191194
END DESIGN

0 commit comments

Comments
 (0)