This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
gold patch committed: Add ODR candidates before symbol resolution
- From: Ian Lance Taylor <iant at google dot com>
- To: binutils at sourceware dot org
- Cc: ppluzhnikov at google dot com
- Date: Sun, 10 Jan 2010 23:11:16 -0800
- Subject: gold patch committed: Add ODR candidates before symbol resolution
Paul pointed out that my recent patch for adding ODR candidates did
not work. It's because of a long-standing minor bug: we check ODR
candidates after symbol resolution, which means that in general TO and
SYM may be the same symbol. I committed this patch to move the ODR
candidate check before symbol resolution, so that we are actually
looking at different symbols.
Ian
2010-01-10 Ian Lance Taylor <iant@google.com>
* resolve.cc (Symbol_table::resolve): Add symbols to list of ODR
candidates before doing symbol resolution.
Index: resolve.cc
===================================================================
RCS file: /cvs/src/src/gold/resolve.cc,v
retrieving revision 1.52
diff -p -u -r1.52 resolve.cc
--- resolve.cc 11 Jan 2010 05:44:04 -0000 1.52
+++ resolve.cc 11 Jan 2010 07:08:48 -0000
@@ -297,6 +297,38 @@ Symbol_table::resolve(Sized_symbol<size>
}
}
+ // A new weak undefined reference, merging with an old weak
+ // reference, could be a One Definition Rule (ODR) violation --
+ // especially if the types or sizes of the references differ. We'll
+ // store such pairs and look them up later to make sure they
+ // actually refer to the same lines of code. We also check
+ // combinations of weak and strong, which might occur if one case is
+ // inline and the other is not. (Note: not all ODR violations can
+ // be found this way, and not everything this finds is an ODR
+ // violation. But it's helpful to warn about.)
+ bool to_is_ordinary;
+ if (parameters->options().detect_odr_violations()
+ && (sym.get_st_bind() == elfcpp::STB_WEAK
+ || to->binding() == elfcpp::STB_WEAK)
+ && orig_st_shndx != elfcpp::SHN_UNDEF
+ && to->shndx(&to_is_ordinary) != elfcpp::SHN_UNDEF
+ && to_is_ordinary
+ && sym.get_st_size() != 0 // Ignore weird 0-sized symbols.
+ && to->symsize() != 0
+ && (sym.get_st_type() != to->type()
+ || sym.get_st_size() != to->symsize())
+ // C does not have a concept of ODR, so we only need to do this
+ // on C++ symbols. These have (mangled) names starting with _Z.
+ && to->name()[0] == '_' && to->name()[1] == 'Z')
+ {
+ Symbol_location fromloc
+ = { object, orig_st_shndx, sym.get_st_value() };
+ Symbol_location toloc = { to->object(), to->shndx(&to_is_ordinary),
+ to->value() };
+ this->candidate_odr_violations_[to->name()].insert(fromloc);
+ this->candidate_odr_violations_[to->name()].insert(toloc);
+ }
+
unsigned int frombits = symbol_to_bits(sym.get_st_bind(),
object->is_dynamic(),
st_shndx, is_ordinary,
@@ -337,38 +369,6 @@ Symbol_table::resolve(Sized_symbol<size>
_("multiple common of '%s'"),
to, OBJECT, object);
}
-
- // A new weak undefined reference, merging with an old weak
- // reference, could be a One Definition Rule (ODR) violation --
- // especially if the types or sizes of the references differ. We'll
- // store such pairs and look them up later to make sure they
- // actually refer to the same lines of code. We also check
- // combinations of weak and strong, which might occur if one case is
- // inline and the other is not. (Note: not all ODR violations can
- // be found this way, and not everything this finds is an ODR
- // violation. But it's helpful to warn about.)
- bool to_is_ordinary;
- if (parameters->options().detect_odr_violations()
- && (sym.get_st_bind() == elfcpp::STB_WEAK
- || to->binding() == elfcpp::STB_WEAK)
- && orig_st_shndx != elfcpp::SHN_UNDEF
- && to->shndx(&to_is_ordinary) != elfcpp::SHN_UNDEF
- && to_is_ordinary
- && sym.get_st_size() != 0 // Ignore weird 0-sized symbols.
- && to->symsize() != 0
- && (sym.get_st_type() != to->type()
- || sym.get_st_size() != to->symsize())
- // C does not have a concept of ODR, so we only need to do this
- // on C++ symbols. These have (mangled) names starting with _Z.
- && to->name()[0] == '_' && to->name()[1] == 'Z')
- {
- Symbol_location fromloc
- = { object, orig_st_shndx, sym.get_st_value() };
- Symbol_location toloc = { to->object(), to->shndx(&to_is_ordinary),
- to->value() };
- this->candidate_odr_violations_[to->name()].insert(fromloc);
- this->candidate_odr_violations_[to->name()].insert(toloc);
- }
}
// Handle the core of symbol resolution. This is called with the