Skip to content

Remove unnecessary ns.follow in simplify_json_expr #3736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 11, 2019
Merged

Remove unnecessary ns.follow in simplify_json_expr #3736

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions src/goto-programs/json_expr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,11 @@ Author: Peter Schrammel

#include <memory>

static exprt simplify_json_expr(const exprt &src, const namespacet &ns)
static exprt simplify_json_expr(const exprt &src)
{
if(src.id() == ID_constant)
{
const typet &type = ns.follow(src.type());

if(type.id() == ID_pointer)
if(src.type().id() == ID_pointer)
{
const constant_exprt &c = to_constant_expr(src);

Expand All @@ -44,7 +42,7 @@ static exprt simplify_json_expr(const exprt &src, const namespacet &ns)
to_unary_expr(src).op().id() != ID_constant)
// try to simplify the constant pointer
{
return simplify_json_expr(to_unary_expr(src).op(), ns);
return simplify_json_expr(to_unary_expr(src).op());
}
}
}
Expand All @@ -56,7 +54,7 @@ static exprt simplify_json_expr(const exprt &src, const namespacet &ns)
.find("@") != std::string::npos)
{
// simplify expressions of the form &member_expr(object, @class_identifier)
return simplify_json_expr(to_address_of_expr(src).object(), ns);
return simplify_json_expr(to_address_of_expr(src).object());
}
else if(
src.id() == ID_address_of &&
Expand All @@ -68,15 +66,15 @@ static exprt simplify_json_expr(const exprt &src, const namespacet &ns)
{
// simplify expressions of the form &array[0]
return simplify_json_expr(
to_index_expr(to_address_of_expr(src).object()).array(), ns);
to_index_expr(to_address_of_expr(src).object()).array());
}
else if(
src.id() == ID_member &&
id2string(to_member_expr(src).get_component_name()).find("@") !=
std::string::npos)
{
// simplify expressions of the form member_expr(object, @class_identifier)
return simplify_json_expr(to_member_expr(src).struct_op(), ns);
return simplify_json_expr(to_member_expr(src).struct_op());
}

return src;
Expand Down Expand Up @@ -287,7 +285,7 @@ json_objectt json(const exprt &expr, const namespacet &ns, const irep_idt &mode)
{
result["name"] = json_stringt("pointer");
result["type"] = json_stringt(type_string);
exprt simpl_expr = simplify_json_expr(expr, ns);
exprt simpl_expr = simplify_json_expr(expr);
if(
simpl_expr.get(ID_value) == ID_NULL ||
// remove typecast on NULL
Expand Down