Skip to content

Commit 826a79b

Browse files
Clean-up irep-id emptyness checks in java-bytecode
1 parent df528eb commit 826a79b

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/java_bytecode/java_bytecode_convert_method.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2309,7 +2309,7 @@ codet java_bytecode_convert_methodt::convert_instructions(
23092309
if(v.is_parameter)
23102310
continue;
23112311
// Skip anonymous variables:
2312-
if(v.symbol_expr.get_identifier()==irep_idt())
2312+
if(v.symbol_expr.get_identifier().empty())
23132313
continue;
23142314
auto &block=get_block_for_pcrange(
23152315
root,

src/java_bytecode/java_bytecode_language.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,9 @@ static void get_virtual_method_targets(
203203
assert(called_function.id()==ID_virtual_function);
204204

205205
const auto &call_class=called_function.get(ID_C_class);
206-
assert(call_class!=irep_idt());
206+
assert(!call_class.empty());
207207
const auto &call_basename=called_function.get(ID_component_name);
208-
assert(call_basename!=irep_idt());
208+
assert(!call_basename.empty());
209209

210210
auto old_size=needed_methods.size();
211211

@@ -218,7 +218,7 @@ static void get_virtual_method_targets(
218218
call_basename,
219219
child_class,
220220
symbol_table);
221-
if(child_method!=irep_idt())
221+
if(!child_method.empty())
222222
needed_methods.push_back(child_method);
223223
}
224224

@@ -231,7 +231,7 @@ static void get_virtual_method_targets(
231231
call_basename,
232232
parent_class_id,
233233
symbol_table);
234-
if(parent_method!=irep_idt())
234+
if(!parent_method.empty())
235235
{
236236
needed_methods.push_back(parent_method);
237237
break;

src/java_bytecode/java_bytecode_parse_tree.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ void java_bytecode_parse_treet::methodt::output(std::ostream &out) const
157157

158158
for(const auto &i : instructions)
159159
{
160-
if(i.source_location.get_line()!=irep_idt())
160+
if(!i.source_location.get_line().empty())
161161
out << " // " << i.source_location << '\n';
162162

163163
out << " " << i.address << ": ";

0 commit comments

Comments
 (0)