Skip to content

Follow-up to 090790a467: attribute __used__ requires unique names #5729

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.

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
Dec 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions regression/ansi-c/gcc_attribute_used1/main.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
static int foo __attribute__((used)) = 42;

int main()
{
return 0;
}
15 changes: 15 additions & 0 deletions regression/ansi-c/gcc_attribute_used1/other.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
struct bar
{
char *ptr;
};

static struct bar foo __attribute__((used))
__attribute__((__section__(".ref.data")));

static struct bar foo __attribute__((used))
__attribute__((__section__(".ref.data"))) = {0};

void use_foo()
{
__CPROVER_assert(foo.ptr == 0, "null");
}
8 changes: 8 additions & 0 deletions regression/ansi-c/gcc_attribute_used1/test.desc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CORE gcc-only
main.c
other.c
^EXIT=0$
^SIGNAL=0$
--
^warning: ignoring
^CONVERSION ERROR$
2 changes: 1 addition & 1 deletion regression/goto-instrument/gcc_attribute_used1/test.desc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ main.c

^EXIT=0$
^SIGNAL=0$
^[[:space:]]*ASSIGN foo := 42$
^[[:space:]]*ASSIGN .*foo := 42$
--
^warning: ignoring
^CONVERSION ERROR$
12 changes: 3 additions & 9 deletions src/ansi-c/ansi_c_declaration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,6 @@ void ansi_c_declarationt::to_symbol(
else if(get_is_extern()) // traditional GCC
symbol.is_file_local=true;
}

// GCC __attribute__((__used__)) - do not treat those as file-local
if(get_is_used())
symbol.is_file_local = false;
}
}
else // non-function
Expand All @@ -190,10 +186,8 @@ void ansi_c_declarationt::to_symbol(
(!symbol.is_static_lifetime && !get_is_extern()) ||
get_is_thread_local();

symbol.is_file_local=
symbol.is_macro ||
(!get_is_global() && !get_is_extern()) ||
(get_is_global() && get_is_static() && !get_is_used()) ||
symbol.is_parameter;
symbol.is_file_local =
symbol.is_macro || (!get_is_global() && !get_is_extern()) ||
(get_is_global() && get_is_static()) || symbol.is_parameter;
}
}
10 changes: 0 additions & 10 deletions src/ansi-c/ansi_c_declaration.h
Original file line number Diff line number Diff line change
Expand Up @@ -195,16 +195,6 @@ class ansi_c_declarationt:public exprt
set(ID_is_weak, is_weak);
}

bool get_is_used() const
{
return get_bool(ID_is_used);
}

void set_is_used(bool is_used)
{
set(ID_is_used, is_used);
}

void to_symbol(
const ansi_c_declaratort &,
symbolt &symbol) const;
Expand Down
17 changes: 16 additions & 1 deletion src/ansi-c/c_typecheck_base.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Author: Daniel Kroening, [email protected]
#include <util/std_types.h>
#include <util/symbol_table_base.h>

#include <goto-programs/name_mangler.h>

#include "ansi_c_declaration.h"
#include "c_storage_spec.h"
#include "expr2c.h"
Expand Down Expand Up @@ -758,7 +760,6 @@ void c_typecheck_baset::typecheck_declaration(
declaration.set_is_register(full_spec.is_register);
declaration.set_is_typedef(full_spec.is_typedef);
declaration.set_is_weak(full_spec.is_weak);
declaration.set_is_used(full_spec.is_used);

symbolt symbol;
declaration.to_symbol(declarator, symbol);
Expand Down Expand Up @@ -788,6 +789,20 @@ void c_typecheck_baset::typecheck_declaration(
symbol.is_macro=true;
}

if(full_spec.is_used && symbol.is_file_local)
{
// GCC __attribute__((__used__)) - do not treat those as file-local, but
// make sure the name is unique
symbol.is_file_local = false;

symbolt symbol_for_renaming = symbol;
if(!full_spec.asm_label.empty())
symbol_for_renaming.name = full_spec.asm_label;
full_spec.asm_label = djb_manglert{}(
symbol_for_renaming,
id2string(symbol_for_renaming.location.get_file()));
}

if(full_spec.section.empty())
apply_asm_label(full_spec.asm_label, symbol);
else
Expand Down