<p dir="ltr">LGTM. That's I think that's not super important but meaningful discussion. :)</p>
<div class="gmail_quote">2015/10/29 10:10 "George Rimar" <<a href="mailto:grimar@accesssoftek.com">grimar@accesssoftek.com</a>>:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">grimar updated this revision to Diff 38745.<br>
grimar added a comment.<br>
<br>
Review comment addressed.<br>
<br>
<br>
<a href="http://reviews.llvm.org/D14171" rel="noreferrer" target="_blank">http://reviews.llvm.org/D14171</a><br>
<br>
Files:<br>
ELF/InputSection.cpp<br>
ELF/InputSection.h<br>
<br>
Index: ELF/InputSection.h<br>
===================================================================<br>
--- ELF/InputSection.h<br>
+++ ELF/InputSection.h<br>
@@ -84,7 +84,7 @@<br>
typedef typename llvm::object::ELFFile<ELFT>::Elf_Shdr Elf_Shdr;<br>
<br>
public:<br>
- std::vector<std::pair<uintX_t, uintX_t>> Offsets;<br>
+ std::vector<std::pair<uintX_t, size_t>> Offsets;<br>
MergeInputSection(ObjectFile<ELFT> *F, const Elf_Shdr *Header);<br>
static bool classof(const InputSectionBase<ELFT> *S);<br>
// Translate an offset in the input section to an offset in the output<br>
Index: ELF/InputSection.cpp<br>
===================================================================<br>
--- ELF/InputSection.cpp<br>
+++ ELF/InputSection.cpp<br>
@@ -164,17 +164,17 @@<br>
// Find the element this offset points to.<br>
auto I = std::upper_bound(<br>
this->Offsets.begin(), this->Offsets.end(), Offset,<br>
- [](const uintX_t &A, const std::pair<uintX_t, uintX_t> &B) {<br>
+ [](const uintX_t &A, const std::pair<uintX_t, size_t> &B) {<br>
return A < B.first;<br>
});<br>
size_t End = I == this->Offsets.end() ? Data.size() : I->first;<br>
--I;<br>
uintX_t Start = I->first;<br>
<br>
// Compute the Addend and if the Base is cached, return.<br>
uintX_t Addend = Offset - Start;<br>
- uintX_t &Base = I->second;<br>
- if (Base != uintX_t(-1))<br>
+ size_t &Base = I->second;<br>
+ if (Base != size_t(-1))<br>
return Base + Addend;<br>
<br>
// Map the base to the offset in the output section and cashe it.<br>
<br>
<br>
</blockquote></div>