<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Thu, Feb 12, 2015 at 2:37 PM, Shankar Easwaran <span dir="ltr"><<a href="mailto:shankare@codeaurora.org" target="_blank">shankare@codeaurora.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: shankare<br>
Date: Thu Feb 12 16:37:27 2015<br>
New Revision: 228968<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=228968&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=228968&view=rev</a><br>
Log:<br>
[ELF] Insert wrap symbols into a set.<br>
<br>
Symbols specified by --wrap was being inserted into a vector, change this to<br>
insert into a set, so that we have unique entries.<br>
<br>
Modified:<br>
lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h<br>
lld/trunk/lib/ReaderWriter/ELF/ELFLinkingContext.cpp<br>
lld/trunk/test/elf/wrap.test<br>
<br>
Modified: lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h?rev=228968&r1=228967&r2=228968&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h?rev=228968&r1=228967&r2=228968&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h (original)<br>
+++ lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h Thu Feb 12 16:37:27 2015<br>
@@ -24,6 +24,7 @@<br>
#include "llvm/Support/ELF.h"<br>
#include <map><br>
#include <memory><br>
+#include <set><br>
<br>
namespace lld {<br>
class DefinedAtom;<br>
@@ -47,6 +48,7 @@ public:<br>
<br>
class ELFLinkingContext : public LinkingContext {<br>
public:<br>
+ typedef std::set<StringRef>::iterator StringRefSetIterT;<br></blockquote><div><br></div><div>You defined StringSetIterT and</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
/// \brief The type of ELF executable that the linker<br>
/// creates.<br>
@@ -305,7 +307,7 @@ public:<br>
// --wrap option.<br>
void addWrapForSymbol(StringRef);<br>
<br>
- StringRefVector wrapCalls() const;<br>
+ range<std::set<StringRef>::iterator> wrapCalls() const;<br>
<br>
private:<br>
ELFLinkingContext() LLVM_DELETED_FUNCTION;<br>
@@ -346,7 +348,7 @@ protected:<br>
StringRef _soname;<br>
StringRefVector _rpathList;<br>
StringRefVector _rpathLinkList;<br>
- StringRefVector _wrapCalls;<br>
+ std::set<StringRef> _wrapCalls;<br>
std::map<std::string, uint64_t> _absoluteSymbols;<br>
llvm::StringSet<> _dynamicallyExportedSymbols;<br>
std::vector<std::unique_ptr<script::Parser>> _scripts;<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/ELF/ELFLinkingContext.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/ELFLinkingContext.cpp?rev=228968&r1=228967&r2=228968&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/ELFLinkingContext.cpp?rev=228968&r1=228967&r2=228968&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/ELF/ELFLinkingContext.cpp (original)<br>
+++ lld/trunk/lib/ReaderWriter/ELF/ELFLinkingContext.cpp Thu Feb 12 16:37:27 2015<br>
@@ -258,10 +258,11 @@ std::string ELFLinkingContext::demangle(<br>
<br>
// Support --wrap option.<br>
void ELFLinkingContext::addWrapForSymbol(StringRef symbol) {<br>
- _wrapCalls.push_back(symbol);<br>
+ _wrapCalls.insert(symbol);<br>
}<br>
<br>
-ELFLinkingContext::StringRefVector ELFLinkingContext::wrapCalls() const {<br>
+range<ELFLinkingContext::StringRefSetIterT><br></blockquote><div><br></div><div>use that here with range<>. Is this needed? Why don't you just return const std::set<StringRef> & from this function?</div><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ELFLinkingContext::wrapCalls() const {<br>
return _wrapCalls;<br>
}<br>
<br>
<br>
Modified: lld/trunk/test/elf/wrap.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/wrap.test?rev=228968&r1=228967&r2=228968&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/wrap.test?rev=228968&r1=228967&r2=228968&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf/wrap.test (original)<br>
+++ lld/trunk/test/elf/wrap.test Thu Feb 12 16:37:27 2015<br>
@@ -26,9 +26,9 @@<br>
#RUN: yaml2obj -format=elf -docnum 2 %s -o %t.wrapfoo.o<br>
#RUN: yaml2obj -format=elf -docnum 3 %s -o %t.realfoo.o<br>
#RUN: lld -flavor gnu -target x86_64 %t.main.o %t.wrapfoo.o %t.realfoo.o \<br>
-#RUN: --wrap foo --noinhibit-exec --output-filetype=yaml -o %t2.out<br>
+#RUN: --wrap foo --wrap foo --noinhibit-exec --output-filetype=yaml -o %t2.out<br>
#RUN: lld -flavor gnu -target x86_64 %t.main.o %t.wrapfoo.o \<br>
-#RUN: --wrap foo --noinhibit-exec --output-filetype=yaml -o %t2.out.undef 2>&1 | \<br>
+#RUN: --wrap foo --wrap foo --noinhibit-exec --output-filetype=yaml -o %t2.out.undef 2>&1 | \<br>
#RUN: FileCheck %s -check-prefix=CHECKUNDEF<br>
#CHECKWRAP: - name: main<br>
#CHECKWRAP: references:<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>