<div dir="ltr">My apologies. I made a mistake when updating the commit message of this just before submitting. I'll roll it back and re-submit with the correct commit message. Embarrassed. :(<div class="gmail_extra"><br>

<div class="gmail_quote">
On Fri, Apr 4, 2014 at 11:01 AM, Rui Ueyama <span dir="ltr"><<a href="mailto:ruiu@google.com" target="_blank">ruiu@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">


Author: ruiu<br>
Date: Fri Apr  4 13:01:52 2014<br>
New Revision: 205635<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=205635&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=205635&view=rev</a><br>
Log:<br>
temporary commit.<br>
<br>
Modified:<br>
    lld/trunk/lib/Core/SymbolTable.cpp<br>
<br>
Modified: lld/trunk/lib/Core/SymbolTable.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/SymbolTable.cpp?rev=205635&r1=205634&r2=205635&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/SymbolTable.cpp?rev=205635&r1=205634&r2=205635&view=diff</a><br>



==============================================================================<br>
--- lld/trunk/lib/Core/SymbolTable.cpp (original)<br>
+++ lld/trunk/lib/Core/SymbolTable.cpp Fri Apr  4 13:01:52 2014<br>
@@ -262,43 +262,37 @@ void SymbolTable::addByName(const Atom &<br>
     break;<br>
   }<br>
   case NCR_DupShLib: {<br>
-      const SharedLibraryAtom* curShLib =<br>
-        dyn_cast<SharedLibraryAtom>(existing);<br>
-      const SharedLibraryAtom* newShLib =<br>
-        dyn_cast<SharedLibraryAtom>(&newAtom);<br>
-      assert(curShLib != nullptr);<br>
-      assert(newShLib != nullptr);<br>
-      bool sameNullness = (curShLib->canBeNullAtRuntime()<br>
-                                      == newShLib->canBeNullAtRuntime());<br>
-      bool sameName = curShLib->loadName().equals(newShLib->loadName());<br>
-      if (!sameName) {<br>
-        useNew = false;<br>
-        if (_context.warnIfCoalesableAtomsHaveDifferentLoadName()) {<br>
-          // FIXME: need diagonstics interface for writing warning messages<br>
-          llvm::errs() << "lld warning: shared library symbol "<br>
-                       << curShLib->name()<br>
-                       << " has different load path in "<br>
-                       << curShLib->file().path()<br>
-                       << " and in "<br>
-                       << newShLib->file().path();<br>
-        }<br>
-      } else if (!sameNullness) {<br>
-        useNew = false;<br>
-        if (_context.warnIfCoalesableAtomsHaveDifferentCanBeNull()) {<br>
-          // FIXME: need diagonstics interface for writing warning messages<br>
-          llvm::errs() << "lld warning: shared library symbol "<br>
-                       << curShLib->name()<br>
-                       << " has different weakness in "<br>
-                       << curShLib->file().path()<br>
-                       << " and in "<br>
-                       << newShLib->file().path();<br>
-        }<br>
-      } else {<br>
-        // Both shlib atoms are identical and can be coalesced.<br>
-        useNew = false;<br>
+    const SharedLibraryAtom *curShLib = dyn_cast<SharedLibraryAtom>(existing);<br>
+    const SharedLibraryAtom *newShLib = dyn_cast<SharedLibraryAtom>(&newAtom);<br>
+    assert(curShLib != nullptr);<br>
+    assert(newShLib != nullptr);<br>
+    bool sameNullness =<br>
+        (curShLib->canBeNullAtRuntime() == newShLib->canBeNullAtRuntime());<br>
+    bool sameName = curShLib->loadName().equals(newShLib->loadName());<br>
+    if (!sameName) {<br>
+      useNew = false;<br>
+      if (_context.warnIfCoalesableAtomsHaveDifferentLoadName()) {<br>
+        // FIXME: need diagonstics interface for writing warning messages<br>
+        llvm::errs() << "lld warning: shared library symbol "<br>
+                     << curShLib->name() << " has different load path in "<br>
+                     << curShLib->file().path() << " and in "<br>
+                     << newShLib->file().path();<br>
       }<br>
+    } else if (!sameNullness) {<br>
+      useNew = false;<br>
+      if (_context.warnIfCoalesableAtomsHaveDifferentCanBeNull()) {<br>
+        // FIXME: need diagonstics interface for writing warning messages<br>
+        llvm::errs() << "lld warning: shared library symbol "<br>
+                     << curShLib->name() << " has different weakness in "<br>
+                     << curShLib->file().path() << " and in "<br>
+                     << newShLib->file().path();<br>
+      }<br>
+    } else {<br>
+      // Both shlib atoms are identical and can be coalesced.<br>
+      useNew = false;<br>
     }<br>
     break;<br>
+  }<br>
   case NCR_Error:<br>
     llvm::errs() << "SymbolTable: error while merging " << name << "\n";<br>
     llvm::report_fatal_error("duplicate symbol error");<br>
<br>
<br>
_______________________________________________<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/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>