mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-21 01:12:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

2011-02-02 Sriraman Tallam <tmsriram@google.com>

Browse Source 
* icf.h (is_section_foldable_candidate): Change type of parameter
        to std::string.
	* icf.cc (Icf::find_identical_sections): Change type of local variable
        section_name to be std::string.
	(is_function_ctor_or_dtor): Change type of parameter to std::string.
This commit is contained in:
Sriraman Tallam 2011-02-02 21:55:29 +00:00
parent e0634ccfe8
commit 4e271fffec
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gold/ChangeLog
View File

@ -1,3 +1,11 @@
2011-02-02 Sriraman Tallam <tmsriram@google.com>
* icf.h (is_section_foldable_candidate): Change type of parameter
to std::string.
* icf.cc (Icf::find_identical_sections): Change type of local variable
section_name to be std::string.
(is_function_ctor_or_dtor): Change type of parameter to std::string.
2011-01-25 Ian Lance Taylor <iant@google.com>
* script.cc (script_add_extern): Rewrite to use

21
gold/icf.cc
View File

@ -652,16 +652,17 @@ match_sections(unsigned int iteration_num,
}
// During safe icf (--icf=safe), only fold functions that are ctors or dtors.
// This function returns true if the mangled function name is a ctor or a
// dtor.
// This function returns true if the section name is that of a ctor or a dtor.
static bool
is_function_ctor_or_dtor(const char* mangled_func_name)
is_function_ctor_or_dtor(const std::string& section_name)
{
if ((is_prefix_of("_ZN", mangled_func_name)
|| is_prefix_of("_ZZ", mangled_func_name))
&& (is_gnu_v3_mangled_ctor(mangled_func_name)
|| is_gnu_v3_mangled_dtor(mangled_func_name)))
const char* mangled_func_name = strrchr(section_name.c_str(), '.');
gold_assert(mangled_func_name != NULL);
if ((is_prefix_of("._ZN", mangled_func_name)
|| is_prefix_of("._ZZ", mangled_func_name))
&& (is_gnu_v3_mangled_ctor(mangled_func_name + 1)
|| is_gnu_v3_mangled_dtor(mangled_func_name + 1)))
{
return true;
}
@ -696,7 +697,7 @@ Icf::find_identical_sections(const Input_objects* input_objects,
for (unsigned int i = 0;i < (*p)->shnum(); ++i)
{
const char* section_name = (*p)->section_name(i).c_str();
const std::string section_name = (*p)->section_name(i);
if (!is_section_foldable_candidate(section_name))
continue;
if (!(*p)->is_section_included(i))
@ -704,13 +705,11 @@ Icf::find_identical_sections(const Input_objects* input_objects,
if (parameters->options().gc_sections()
&& symtab->gc()->is_section_garbage(*p, i))
continue;
const char* mangled_func_name = strrchr(section_name, '.');
gold_assert(mangled_func_name != NULL);
// With --icf=safe, check if the mangled function name is a ctor
// or a dtor. The mangled function name can be obtained from the
// section name by stripping the section prefix.
if (parameters->options().icf_safe_folding()
&& !is_function_ctor_or_dtor(mangled_func_name + 1)
&& !is_function_ctor_or_dtor(section_name)
&& (!target.can_check_for_function_pointers()
|| section_has_function_pointers(*p, i)))
{

7
gold/icf.h
View File

@ -168,10 +168,11 @@ class Icf
// earlier gcc versions, like 4.0.3, put constructors and destructors in
// .gnu.linkonce.t sections and hence should be included too.
inline bool
is_section_foldable_candidate(const char* section_name)
is_section_foldable_candidate(const std::string& section_name)
{
return (is_prefix_of(".text", section_name)
|| is_prefix_of(".gnu.linkonce.t", section_name));
const char* section_name_cstr = section_name.c_str();
return (is_prefix_of(".text", section_name_cstr)
|| is_prefix_of(".gnu.linkonce.t", section_name_cstr));
}
} // End of namespace gold.