<div dir="ltr">Yes it does.<div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jan 20, 2015 at 7:26 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">Does the test you changed, test the fix for start/end group ?<div><div><br>
<br>
On 1/20/2015 7:26 PM, Rui Ueyama wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: ruiu<br>
Date: Tue Jan 20 19:26:43 2015<br>
New Revision: 226632<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=226632&view=rev" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project?rev=226632&view=rev</a><br>
Log:<br>
Fix --start-group/end-group.<br>
<br>
We used to manage the state whether we are in a group or not<br>
using a counter. The counter is incremented by one if we jump from<br>
end-group to start-group, and decremented by one if we don't.<br>
The counter was assumed to be either zero or one, but obviously it<br>
could be negative (if there's a group which is not repeated at all).<br>
This is a fix for that issue.<br>
<br>
Modified:<br>
lld/trunk/include/lld/Core/<u></u>Resolver.h<br>
lld/trunk/lib/Core/Resolver.<u></u>cpp<br>
lld/trunk/test/pecoff/Inputs/<u></u>vars-main-x86.obj.yaml<br>
<br>
Modified: lld/trunk/include/lld/Core/<u></u>Resolver.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/Resolver.h?rev=226632&r1=226631&r2=226632&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/lld/trunk/include/lld/<u></u>Core/Resolver.h?rev=226632&r1=<u></u>226631&r2=226632&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- lld/trunk/include/lld/Core/<u></u>Resolver.h (original)<br>
+++ lld/trunk/include/lld/Core/<u></u>Resolver.h Tue Jan 20 19:26:43 2015<br>
@@ -58,7 +58,7 @@ private:<br>
typedef std::function<void(StringRef, bool)> UndefCallback;<br>
bool undefinesAdded(int begin, int end);<br>
- File *getFile(int &index, int &groupLevel);<br>
+ File *getFile(int &index, bool &inGroup);<br>
/// \brief Add section group/.gnu.linkonce if it does not exist previously.<br>
void maybeAddSectionGroupOrGnuLinkO<u></u>nce(const DefinedAtom &atom);<br>
<br>
Modified: lld/trunk/lib/Core/Resolver.<u></u>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/Resolver.cpp?rev=226632&r1=226631&r2=226632&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/lld/trunk/lib/Core/<u></u>Resolver.cpp?rev=226632&r1=<u></u>226631&r2=226632&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- lld/trunk/lib/Core/Resolver.<u></u>cpp (original)<br>
+++ lld/trunk/lib/Core/Resolver.<u></u>cpp Tue Jan 20 19:26:43 2015<br>
@@ -254,7 +254,7 @@ bool Resolver::undefinesAdded(int begin,<br>
return false;<br>
}<br>
-File *Resolver::getFile(int &index, int &groupLevel) {<br>
+File *Resolver::getFile(int &index, bool &inGroup) {<br>
std::vector<std::unique_ptr<<u></u>Node>> &inputs = _context.getNodes();<br>
if ((size_t)index >= inputs.size())<br>
return nullptr;<br>
@@ -265,12 +265,12 @@ File *Resolver::getFile(int &index, int<br>
int size = group->getSize();<br>
if (undefinesAdded(index - size, index)) {<br>
index -= size;<br>
- ++groupLevel;<br>
- return getFile(index, groupLevel);<br>
+ inGroup = true;<br>
+ return getFile(index, inGroup);<br>
}<br>
++index;<br>
- --groupLevel;<br>
- return getFile(index, groupLevel);<br>
+ inGroup = false;<br>
+ return getFile(index, inGroup);<br>
}<br>
return cast<FileNode>(inputs[index++]<u></u>.get())->getFile();<br>
}<br>
@@ -290,10 +290,10 @@ void Resolver::<u></u>makePreloadArchiveMap() {<br>
bool Resolver::resolveUndefines() {<br>
ScopedTask task(getDefaultDomain(), "resolveUndefines");<br>
int index = 0;<br>
- int groupLevel = 0;<br>
+ bool inGroup = false;<br>
for (;;) {<br>
bool undefAdded = false;<br>
- File *file = getFile(index, groupLevel);<br>
+ File *file = getFile(index, inGroup);<br>
if (!file)<br>
return true;<br>
if (std::error_code ec = file->parse()) {<br>
@@ -304,7 +304,7 @@ bool Resolver::resolveUndefines() {<br>
file->beforeLink();<br>
switch (file->kind()) {<br>
case File::kindObject:<br>
- if (groupLevel > 0)<br>
+ if (inGroup)<br>
break;<br>
assert(!file->hasOrdinal());<br>
file->setOrdinal(_context.<u></u>getNextOrdinalAndIncrement());<br>
<br>
Modified: lld/trunk/test/pecoff/Inputs/<u></u>vars-main-x86.obj.yaml<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/Inputs/vars-main-x86.obj.yaml?rev=226632&r1=226631&r2=226632&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/lld/trunk/test/pecoff/<u></u>Inputs/vars-main-x86.obj.yaml?<u></u>rev=226632&r1=226631&r2=<u></u>226632&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- lld/trunk/test/pecoff/Inputs/<u></u>vars-main-x86.obj.yaml (original)<br>
+++ lld/trunk/test/pecoff/Inputs/<u></u>vars-main-x86.obj.yaml Tue Jan 20 19:26:43 2015<br>
@@ -60,4 +60,10 @@ symbols:<br>
SimpleType: IMAGE_SYM_TYPE_NULL<br>
ComplexType: IMAGE_SYM_DTYPE_NULL<br>
StorageClass: IMAGE_SYM_CLASS_EXTERNAL<br>
+ - Name: ___ImageBase<br>
+ Value: 0<br>
+ SectionNumber: 0<br>
+ SimpleType: IMAGE_SYM_TYPE_NULL<br>
+ ComplexType: IMAGE_SYM_DTYPE_NULL<br>
+ StorageClass: IMAGE_SYM_CLASS_EXTERNAL<br>
...<br>
<br>
<br>
______________________________<u></u>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">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/<u></u>mailman/listinfo/llvm-commits</a><br>
<br>
<br>
</blockquote>
<br>
<br></div></div><span><font color="#888888">
-- <br>
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by the Linux Foundation<br>
<br>
</font></span></blockquote></div><br></div></div>