<div dir="ltr">Huh, that's true. I remembered something was still using layout-after but I misunderstood that that was removed. Rolling this back now. Thank you for pointing that out.</div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Feb 26, 2015 at 9:12 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">I thought there was a use of layout-after/layout-before edges to compute section size for handling COMDAT's w.r.t PECOFF.<br>
<br>
If layout-after references are deleted, how does getSectionSize() work ?<br>
<br>
Shankar Easwaran<div class="HOEnZb"><div class="h5"><br>
<br>
On 2/26/2015 11:05 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: Thu Feb 26 23:05:38 2015<br>
New Revision: 230732<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=230732&view=rev" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project?rev=230732&view=rev</a><br>
Log:<br>
PECOFF: Do not add layout-after edges.<br>
<br>
Previously we needed to create atoms as a doubly-linked link, but it's<br>
no longer needed. Also we don't use layout-after edges in PE/COFF.<br>
Creating such edges is just waste.<br>
<br>
Modified:<br>
lld/trunk/lib/ReaderWriter/<u></u>PECOFF/Atoms.h<br>
lld/trunk/lib/ReaderWriter/<u></u>PECOFF/ReaderCOFF.cpp<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/<u></u>PECOFF/Atoms.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/Atoms.h?rev=230732&r1=230731&r2=230732&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/lld/trunk/lib/<u></u>ReaderWriter/PECOFF/Atoms.h?<u></u>rev=230732&r1=230731&r2=<u></u>230732&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- lld/trunk/lib/ReaderWriter/<u></u>PECOFF/Atoms.h (original)<br>
+++ lld/trunk/lib/ReaderWriter/<u></u>PECOFF/Atoms.h Thu Feb 26 23:05:38 2015<br>
@@ -351,27 +351,16 @@ void addLayoutEdge(T *a, U *b, uint32_t<br>
a->addReference(std::unique_<u></u>ptr<COFFReference>(ref));<br>
}<br>
-template <typename T, typename U> void connectWithLayoutEdge(T *a, U *b) {<br>
- addLayoutEdge(a, b, lld::Reference::<u></u>kindLayoutAfter);<br>
- addLayoutEdge(b, a, lld::Reference::<u></u>kindLayoutBefore);<br>
-}<br>
-<br>
-/// Connect atoms with layout-{before,after} edges. It usually serves two<br>
-/// purposes.<br>
-///<br>
-/// - To prevent atoms from being GC'ed (aka dead-stripped) if there is a<br>
-/// reference to one of the atoms. In that case we want to emit all the<br>
-/// atoms appeared in the same section, because the referenced "live" atom<br>
-/// may reference other atoms in the same section. If we don't add layout<br>
-/// edges between atoms, unreferenced atoms in the same section would be<br>
-/// GC'ed.<br>
-/// - To preserve the order of atmos. We want to emit the atoms in the<br>
-/// same order as they appeared in the input object file.<br>
+/// Connect atoms with layout-before edges. It prevents atoms from<br>
+/// being GC'ed (aka dead-stripped) if there is a reference to one of<br>
+/// the atoms in the same layout-before chain. In such case we want to<br>
+/// emit all the atoms appeared in the same chain, because the "live"<br>
+/// atom may reference other atoms in the same chain.<br>
template <typename T> void connectAtomsWithLayoutEdge(<u></u>std::vector<T *> &atoms) {<br>
if (atoms.size() < 2)<br>
return;<br>
for (auto it = atoms.begin(), e = atoms.end(); it + 1 != e; ++it)<br>
- connectWithLayoutEdge(*it, *(it + 1));<br>
+ addLayoutEdge(*(it + 1), *it, lld::Reference::<u></u>kindLayoutBefore);<br>
}<br>
} // namespace pecoff<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/<u></u>PECOFF/ReaderCOFF.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp?rev=230732&r1=230731&r2=230732&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/lld/trunk/lib/<u></u>ReaderWriter/PECOFF/<u></u>ReaderCOFF.cpp?rev=230732&r1=<u></u>230731&r2=230732&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- lld/trunk/lib/ReaderWriter/<u></u>PECOFF/ReaderCOFF.cpp (original)<br>
+++ lld/trunk/lib/ReaderWriter/<u></u>PECOFF/ReaderCOFF.cpp Thu Feb 26 23:05:38 2015<br>
@@ -756,7 +756,7 @@ std::error_code FileCOFF::AtomizeDefined<br>
if (atoms.size() > 0)<br>
atoms[0]->setAlignment(<u></u>getAlignment(section));<br>
- // Connect atoms with layout-before/layout-after edges.<br>
+ // Connect atoms with layout-before edges.<br>
connectAtomsWithLayoutEdge(<u></u>atoms);<br>
for (COFFDefinedFileAtom *atom : atoms) {<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 class="HOEnZb"><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>