<div dir="ltr">LGTM. Thank you for doing this.</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Aug 22, 2013 at 8:37 AM, 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 Aug 22 10:37:09 2013<br>
New Revision: 189025<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=189025&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=189025&view=rev</a><br>
Log:<br>
[lld][PECOFF] Fix use of temporary strings<br>
<br>
Modified:<br>
    lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h<br>
    lld/trunk/lib/Driver/WinLinkDriver.cpp<br>
    lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp<br>
<br>
Modified: lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h?rev=189025&r1=189024&r2=189025&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h?rev=189025&r1=189024&r2=189025&view=diff</a><br>


==============================================================================<br>
--- lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h (original)<br>
+++ lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h Thu Aug 22 10:37:09 2013<br>
@@ -95,7 +95,7 @@ public:<br>
   virtual ErrorOr<Reference::Kind> relocKindFromString(StringRef str) const;<br>
   virtual ErrorOr<std::string> stringFromRelocKind(Reference::Kind kind) const;<br>
<br>
-  StringRef allocateString(StringRef ref) {<br>
+  StringRef allocateString(StringRef ref) const {<br>
     char *x = _alloc.Allocate<char>(ref.size() + 1);<br>
     memcpy(x, ref.data(), ref.size());<br>
     x[ref.size()] = '\0';<br>
<br>
Modified: lld/trunk/lib/Driver/WinLinkDriver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/WinLinkDriver.cpp?rev=189025&r1=189024&r2=189025&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/WinLinkDriver.cpp?rev=189025&r1=189024&r2=189025&view=diff</a><br>


==============================================================================<br>
--- lld/trunk/lib/Driver/WinLinkDriver.cpp (original)<br>
+++ lld/trunk/lib/Driver/WinLinkDriver.cpp Thu Aug 22 10:37:09 2013<br>
@@ -195,7 +195,7 @@ StringRef PECOFFFileNode::path(const Lin<br>
   if (_path.endswith(".lib"))<br>
     return _ctx.searchLibraryFile(_path);<br>
   if (llvm::sys::path::extension(_path).empty())<br>
-    return (_path.str() + ".obj");<br>
+    return (_ctx.allocateString(_path.str() + ".obj"));<br>
   return _path;<br>
 }<br>
<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp?rev=189025&r1=189024&r2=189025&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp?rev=189025&r1=189024&r2=189025&view=diff</a><br>


==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp (original)<br>
+++ lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp Thu Aug 22 10:37:09 2013<br>
@@ -73,7 +73,7 @@ StringRef PECOFFLinkingContext::searchLi<br>
     SmallString<128> path = dir;<br>
     llvm::sys::path::append(path, filename);<br>
     if (llvm::sys::fs::exists(path.str()))<br>
-      return (*(new (_alloc) std::string(path.str())));<br>
+      return allocateString(path.str());<br>
   }<br>
   return filename;<br>
 }<br>
@@ -95,5 +95,4 @@ void PECOFFLinkingContext::addPasses(Pas<br>
   pm.add(std::unique_ptr<Pass>(new pecoff::IdataPass()));<br>
   pm.add(std::unique_ptr<Pass>(new LayoutPass()));<br>
 }<br>
-<br>
 } // end namespace lld<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>