Skip to content

Commit 2200ac9

Browse files
author
Owen Jones
committed
Replace unsigned with more precise type
object_numberingt::number_type is the correct type for indexing object_numberingt, and it actually resolves to sizet rather than unsigned. This was done in diffblue#1541 for value_set.*, before I realised that the other variants would need changing as well.
1 parent dd7ebd3 commit 2200ac9

File tree

5 files changed

+49
-21
lines changed

5 files changed

+49
-21
lines changed

‎src/pointer-analysis/value_set_fi.h

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class value_set_fit
7373

7474
class object_map_dt
7575
{
76-
typedef std::map<unsigned, objectt> data_typet;
76+
typedef std::map<object_numberingt::number_type, objectt> data_typet;
7777
data_typet data;
7878

7979
public:
@@ -94,7 +94,10 @@ class value_set_fit
9494

9595
size_t size() const { return data.size(); }
9696

97-
objectt &operator[](unsigned i) { return data[i]; }
97+
objectt &operator[](object_numberingt::number_type i)
98+
{
99+
return data[i];
100+
}
98101

99102
template <typename It>
100103
void insert(It b, It e) { data.insert(b, e); }
@@ -135,7 +138,10 @@ class value_set_fit
135138
return insert(dest, object_numbering.number(src), objectt(offset));
136139
}
137140

138-
bool insert(object_mapt &dest, unsigned n, const objectt &object) const
141+
bool insert(
142+
object_mapt &dest,
143+
object_numberingt::number_type n,
144+
const objectt &object) const
139145
{
140146
if(dest.read().find(n)==dest.read().end())
141147
{

‎src/pointer-analysis/value_set_fivr.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1674,7 +1674,7 @@ void value_set_fivrt::apply_code(
16741674

16751675
bool value_set_fivrt::insert_to(
16761676
object_mapt &dest,
1677-
unsigned n,
1677+
object_numberingt::number_type n,
16781678
const objectt &object) const
16791679
{
16801680
object_map_dt &map=dest.write();
@@ -1715,7 +1715,7 @@ bool value_set_fivrt::insert_to(
17151715

17161716
bool value_set_fivrt::insert_from(
17171717
object_mapt &dest,
1718-
unsigned n,
1718+
object_numberingt::number_type n,
17191719
const objectt &object) const
17201720
{
17211721
object_map_dt &map=dest.write();

‎src/pointer-analysis/value_set_fivr.h

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,18 @@ class value_set_fivrt
7676
object_map_dt() {}
7777
static const object_map_dt blank;
7878

79-
typedef std::map<unsigned, objectt> objmapt;
79+
typedef std::map<object_numberingt::number_type, objectt> objmapt;
8080
objmapt objmap;
8181

8282
// NOLINTNEXTLINE(readability/identifiers)
8383
typedef objmapt::const_iterator const_iterator;
8484
// NOLINTNEXTLINE(readability/identifiers)
8585
typedef objmapt::iterator iterator;
8686

87-
const_iterator find(unsigned k) { return objmap.find(k); }
87+
const_iterator find(object_numberingt::number_type k)
88+
{
89+
return objmap.find(k);
90+
}
8891
iterator begin() { return objmap.begin(); }
8992
const_iterator begin() const { return objmap.begin(); }
9093
iterator end() { return objmap.end(); }
@@ -93,17 +96,19 @@ class value_set_fivrt
9396
bool empty() const { return objmap.empty(); }
9497
void clear() { objmap.clear(); validity_ranges.clear(); }
9598

96-
objectt &operator[](unsigned k)
99+
objectt &operator[](object_numberingt::number_type k)
97100
{
98101
return objmap[k];
99102
}
100103

101104
// operator[] is the only way to insert something!
102-
std::pair<iterator, bool> insert(const std::pair<unsigned, objectt>&)
105+
std::pair<iterator, bool>
106+
insert(const std::pair<object_numberingt::number_type, objectt> &)
103107
{
104108
UNREACHABLE;
105109
}
106-
iterator insert(iterator, const std::pair<unsigned, objectt>&)
110+
iterator
111+
insert(iterator, const std::pair<object_numberingt::number_type, objectt> &)
107112
{
108113
UNREACHABLE;
109114
}
@@ -166,7 +171,10 @@ class value_set_fivrt
166171
return insert_to(dest, object_numbering.number(src), objectt(offset));
167172
}
168173

169-
bool insert_to(object_mapt &dest, unsigned n, const objectt &object) const;
174+
bool insert_to(
175+
object_mapt &dest,
176+
object_numberingt::number_type n,
177+
const objectt &object) const;
170178

171179
bool insert_to(
172180
object_mapt &dest,
@@ -194,7 +202,10 @@ class value_set_fivrt
194202
return insert_from(dest, object_numbering.number(src), objectt(offset));
195203
}
196204

197-
bool insert_from(object_mapt &dest, unsigned n, const objectt &object) const;
205+
bool insert_from(
206+
object_mapt &dest,
207+
object_numberingt::number_type n,
208+
const objectt &object) const;
198209

199210
bool insert_from(
200211
object_mapt &dest,

‎src/pointer-analysis/value_set_fivrns.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1330,7 +1330,7 @@ void value_set_fivrnst::apply_code(
13301330

13311331
bool value_set_fivrnst::insert_to(
13321332
object_mapt &dest,
1333-
unsigned n,
1333+
object_numberingt::number_type n,
13341334
const objectt &object) const
13351335
{
13361336
object_map_dt &map = dest.write();
@@ -1371,7 +1371,7 @@ bool value_set_fivrnst::insert_to(
13711371

13721372
bool value_set_fivrnst::insert_from(
13731373
object_mapt &dest,
1374-
unsigned n,
1374+
object_numberingt::number_type n,
13751375
const objectt &object) const
13761376
{
13771377
object_map_dt &map = dest.write();

‎src/pointer-analysis/value_set_fivrns.h

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,18 @@ class value_set_fivrnst
7777
object_map_dt() {}
7878
static const object_map_dt blank;
7979

80-
typedef std::map<unsigned, objectt> objmapt;
80+
typedef std::map<object_numberingt::number_type, objectt> objmapt;
8181
objmapt objmap;
8282

8383
// NOLINTNEXTLINE(readability/identifiers)
8484
typedef objmapt::const_iterator const_iterator;
8585
// NOLINTNEXTLINE(readability/identifiers)
8686
typedef objmapt::iterator iterator;
8787

88-
const_iterator find(unsigned k) { return objmap.find(k); }
88+
const_iterator find(object_numberingt::number_type k)
89+
{
90+
return objmap.find(k);
91+
}
8992
iterator begin() { return objmap.begin(); }
9093
const_iterator begin() const { return objmap.begin(); }
9194
iterator end() { return objmap.end(); }
@@ -94,17 +97,19 @@ class value_set_fivrnst
9497
bool empty() const { return objmap.empty(); }
9598
void clear() { objmap.clear(); validity_ranges.clear(); }
9699

97-
objectt &operator[](unsigned k)
100+
objectt &operator[](object_numberingt::number_type k)
98101
{
99102
return objmap[k];
100103
}
101104

102105
// operator[] is the only way to insert something!
103-
std::pair<iterator, bool> insert(const std::pair<unsigned, objectt>&)
106+
std::pair<iterator, bool>
107+
insert(const std::pair<object_numberingt::number_type, objectt> &)
104108
{
105109
UNREACHABLE;
106110
}
107-
iterator insert(iterator, const std::pair<unsigned, objectt>&)
111+
iterator
112+
insert(iterator, const std::pair<object_numberingt::number_type, objectt> &)
108113
{
109114
UNREACHABLE;
110115
}
@@ -166,7 +171,10 @@ class value_set_fivrnst
166171
return insert_to(dest, object_numbering.number(src), objectt(offset));
167172
}
168173

169-
bool insert_to(object_mapt &dest, unsigned n, const objectt &object) const;
174+
bool insert_to(
175+
object_mapt &dest,
176+
object_numberingt::number_type n,
177+
const objectt &object) const;
170178

171179
bool insert_to(
172180
object_mapt &dest,
@@ -194,7 +202,10 @@ class value_set_fivrnst
194202
return insert_from(dest, object_numbering.number(src), objectt(offset));
195203
}
196204

197-
bool insert_from(object_mapt &dest, unsigned n, const objectt &object) const;
205+
bool insert_from(
206+
object_mapt &dest,
207+
object_numberingt::number_type n,
208+
const objectt &object) const;
198209

199210
bool insert_from(
200211
object_mapt &dest,

0 commit comments

Comments
 (0)