Skip to content

Linking/static lifetime init: do not use goto code types #6554

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
Feb 5, 2022
Merged

Linking/static lifetime init: do not use goto code types #6554

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
12 changes: 3 additions & 9 deletions src/linking/static_lifetime_init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ Author: Daniel Kroening, [email protected]

#include "static_lifetime_init.h"

#include <goto-programs/goto_instruction_code.h>

#include <util/arith_tools.h>
#include <util/c_types.h>
#include <util/expr_initializer.h>
Expand Down Expand Up @@ -90,10 +88,7 @@ static_lifetime_init(const irep_idt &identifier, symbol_tablet &symbol_table)
else
rhs = symbol.value;

code_assignt code(symbol.symbol_expr(), rhs);
code.add_source_location() = symbol.location;

return std::move(code);
return code_frontend_assignt{symbol.symbol_expr(), rhs, symbol.location};
}

void static_lifetime_init(
Expand Down Expand Up @@ -156,9 +151,8 @@ void static_lifetime_init(
code_type.return_type().id() == ID_constructor &&
code_type.parameters().empty())
{
code_function_callt function_call(symbol.symbol_expr());
function_call.add_source_location()=source_location;
dest.add(function_call);
dest.add(code_expressiont{side_effect_expr_function_callt{
symbol.symbol_expr(), {}, code_type.return_type(), source_location}});
}
}
}