Skip to content

Commit 68f3400

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 3306276 commit 68f3400

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
@@ -525,7 +525,7 @@ main_function_resultt get_main_symbol(
525525
irep_idt main_symbol_id=
526526
resolve_friendly_method_name(config.main, symbol_table, error_message);
527527

528-
if(main_symbol_id==irep_idt())
528+
if(main_symbol_id.empty())
529529
{
530530
message.error()
531531
<< "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
@@ -323,7 +323,7 @@ class recursion_set_entryt
323323
/// Removes erase_entry (if set) from the controlled set.
324324
~recursion_set_entryt()
325325
{
326-
if(erase_entry!=irep_idt())
326+
if(!erase_entry.empty())
327327
recursion_set.erase(erase_entry);
328328
}
329329

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

src/ansi-c/parser_static.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ static void make_subtype(typet &dest, typet &src)
224224
}
225225
else if(p->is_nil())
226226
assert(false);
227-
else if(p->id()==irep_idt())
227+
else if(p->id().empty())
228228
assert(false);
229229
else
230230
{
@@ -247,7 +247,7 @@ static void make_subtype(typet &dest, typet &src)
247247
auto &merged_type = to_merged_type(*p);
248248
p=&merged_type.last_type();
249249
}
250-
else if(p->id()==irep_idt())
250+
else if(p->id().empty())
251251
assert(false);
252252
else if(p->is_nil())
253253
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)