<div dir="ltr">Broke lld it looks like:<br><br>







<p class="p1"><span class="s1">llvm[4]: Compiling WinLinkDriver.cpp for Debug+Asserts build</span></p>
<p class="p2"><span class="s1"><b>/usr/local/google/home/echristo/sources/llvm/tools/lld/lib/Driver/WinLinkDriver.cpp:461:12: </b></span><span class="s2"><b>error: </b></span><span class="s1"><b>cannot initialize return object of type 'bool' with an lvalue of type 'llvm::NoneType'</b></span></p>
<p class="p1"><span class="s1">    return llvm::None;</span></p>
<p class="p3"><span class="s1"><b>           ^~~~~~~~~~</b></span></p>
<p class="p1"><span class="s1">1 error generated.</span></p><br></div><br><div class="gmail_quote">On Thu Feb 19 2015 at 11:32:53 PM Justin Bogner <<a href="mailto:mail@justinbogner.com">mail@justinbogner.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: bogner<br>
Date: Fri Feb 20 01:28:28 2015<br>
New Revision: 229980<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=229980&view=rev" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project?rev=229980&view=rev</a><br>
Log:<br>
Disallow implicit conversions from None to integer types<br>
<br>
This fixes an error introduced in r228934 where None was converted to<br>
an int instead of the int being converted to an Optional as intended.<br>
We make that sort of mistake a compile error by changing NoneType into<br>
a scoped enum.<br>
<br>
Finally, provide a static NoneType called None to avoid forcing all<br>
users to spell it NoneType::None.<br>
<br>
Modified:<br>
    llvm/trunk/include/llvm/ADT/<u></u>None.h<br>
    llvm/trunk/lib/ProfileData/<u></u>CoverageMapping.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/ADT/<u></u>None.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/None.h?rev=229980&r1=229979&r2=229980&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/include/<u></u>llvm/ADT/None.h?rev=229980&r1=<u></u>229979&r2=229980&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/include/llvm/ADT/<u></u>None.h (original)<br>
+++ llvm/trunk/include/llvm/ADT/<u></u>None.h Fri Feb 20 01:28:28 2015<br>
@@ -19,9 +19,8 @@<br>
 namespace llvm {<br>
 /// \brief A simple null object to allow implicit construction of Optional<T><br>
 /// and similar types without having to spell out the specialization's name.<br>
-enum NoneType {<br>
-  None<br>
-};<br>
+enum class NoneType { None };<br>
+static NoneType None;<br>
 }<br>
<br>
 #endif<br>
<br>
Modified: llvm/trunk/lib/ProfileData/<u></u>CoverageMapping.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ProfileData/CoverageMapping.cpp?rev=229980&r1=229979&r2=229980&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/lib/<u></u>ProfileData/CoverageMapping.<u></u>cpp?rev=229980&r1=229979&r2=<u></u>229980&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/lib/ProfileData/<u></u>CoverageMapping.cpp (original)<br>
+++ llvm/trunk/lib/ProfileData/<u></u>CoverageMapping.cpp Fri Feb 20 01:28:28 2015<br>
@@ -361,7 +361,9 @@ static Optional<unsigned> findMainViewFi<br>
       IsNotExpandedFile[CR.<u></u>ExpandedFileID] = false;<br>
   IsNotExpandedFile &= FilenameEquivalence;<br>
   int I = IsNotExpandedFile.find_first()<u></u>;<br>
-  return I != -1 ? I : None;<br>
+  if (I == -1)<br>
+    return None;<br>
+  return I;<br>
 }<br>
<br>
 static Optional<unsigned> findMainViewFileID(const FunctionRecord &Function) {<br>
@@ -370,7 +372,9 @@ static Optional<unsigned> findMainViewFi<br>
     if (CR.Kind == CounterMappingRegion::<u></u>ExpansionRegion)<br>
       IsNotExpandedFile[CR.<u></u>ExpandedFileID] = false;<br>
   int I = IsNotExpandedFile.find_first()<u></u>;<br>
-  return I != -1 ? I : None;<br>
+  if (I == -1)<br>
+    return None;<br>
+  return I;<br>
 }<br>
<br>
 /// Sort a nested sequence of regions from a single file.<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>
</blockquote></div>