Skip to content

Commit c851c47

Browse files
committed
Use s.empty() or !s.empty() instead of comparison to irep_idt()
This avoids constructing an object when we can just use an integer comparison.
1 parent c04cbce commit c851c47

File tree

5 files changed

+8
-11
lines changed

5 files changed

+8
-11
lines changed

jbmc/src/java_bytecode/java_entry_point.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ main_function_resultt get_main_symbol(
526526
irep_idt main_symbol_id=
527527
resolve_friendly_method_name(config.main, symbol_table, error_message);
528528

529-
if(main_symbol_id==irep_idt())
529+
if(main_symbol_id.empty())
530530
{
531531
message.error()
532532
<< "main symbol resolution failed: " << error_message << messaget::eom;

jbmc/src/java_bytecode/java_object_factory.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ class recursion_set_entryt
321321
/// Removes erase_entry (if set) from the controlled set.
322322
~recursion_set_entryt()
323323
{
324-
if(erase_entry!=irep_idt())
324+
if(!erase_entry.empty())
325325
recursion_set.erase(erase_entry);
326326
}
327327

@@ -334,10 +334,8 @@ class recursion_set_entryt
334334
/// \return true if added to the set (and therefore owned by this object)
335335
bool insert_entry(const irep_idt &entry)
336336
{
337-
INVARIANT(
338-
erase_entry==irep_idt(),
339-
"insert_entry should only be called once");
340-
INVARIANT(entry!=irep_idt(), "entry should be a struct tag");
337+
INVARIANT(erase_entry.empty(), "insert_entry should only be called once");
338+
INVARIANT(!entry.empty(), "entry should be a struct tag");
341339
bool ret=recursion_set.insert(entry).second;
342340
if(ret)
343341
{

src/ansi-c/parser_static.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ static void make_subtype(typet &dest, typet &src)
225225
}
226226
else if(p->is_nil())
227227
assert(false);
228-
else if(p->id()==irep_idt())
228+
else if(p->id().empty())
229229
assert(false);
230230
else
231231
{
@@ -248,7 +248,7 @@ static void make_subtype(typet &dest, typet &src)
248248
auto &merged_type = to_merged_type(*p);
249249
p=&merged_type.last_type();
250250
}
251-
else if(p->id()==irep_idt())
251+
else if(p->id().empty())
252252
assert(false);
253253
else if(p->is_nil())
254254
assert(false);

src/goto-programs/instrument_preconditions.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ replace_symbolt actuals_replace_map(
7575
std::size_t count=0;
7676
for(const auto &p : parameters)
7777
{
78-
if(p.get_identifier()!=irep_idt() &&
79-
arguments.size()>count)
78+
if(!p.get_identifier().empty() && arguments.size() > count)
8079
{
8180
const exprt a =
8281
typecast_exprt::conditional_cast(arguments[count], p.type());

src/solvers/smt2/smt2_conv.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ constant_exprt smt2_convt::parse_literal(
232232

233233
mp_integer value;
234234

235-
if(src.id()!=irep_idt())
235+
if(!src.id().empty())
236236
{
237237
const std::string &s=src.id_string();
238238

0 commit comments

Comments
 (0)