<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Nov 30, 2015 at 6:35 PM, Davide Italiano via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: davide<br>
Date: Mon Nov 30 20:35:04 2015<br>
New Revision: 254363<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=254363&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=254363&view=rev</a><br>
Log:<br>
[Windows] Simplify assertion code. NFC.<br>
<br>
<br>
Modified:<br>
    llvm/trunk/lib/Support/Windows/DynamicLibrary.inc<br>
    llvm/trunk/lib/Support/Windows/Signals.inc<br>
<br>
Modified: llvm/trunk/lib/Support/Windows/DynamicLibrary.inc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/DynamicLibrary.inc?rev=254363&r1=254362&r2=254363&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/DynamicLibrary.inc?rev=254363&r1=254362&r2=254363&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Support/Windows/DynamicLibrary.inc (original)<br>
+++ llvm/trunk/lib/Support/Windows/DynamicLibrary.inc Mon Nov 30 20:35:04 2015<br>
@@ -61,10 +61,8 @@ DynamicLibrary DynamicLibrary::getPerman<br>
       OpenedHandles = new DenseSet<HMODULE>();<br>
<br>
     if (!fEnumerateLoadedModules) {<br>
-      if (!loadDebugHelp()) {<br>
-        assert(false && "These APIs should always be available");<br>
-        return DynamicLibrary();<br>
-      }<br>
+      assert(loadDebugHelp() && "These APIs should always be available");<br>
+      return DynamicLibrary();<br></blockquote><div><br></div><div>This looks like the wrong transformation - the previous code never returned under valid situations (it only returned when the assertion would've fired)<br><br>It looks like this should be:<br><br>  assert(fEnumerateLoadedModules || loadDebugHelp())<br><br>with no ifs/returns, yes?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
     }<br>
<br>
     fEnumerateLoadedModules(GetCurrentProcess(), ELM_Callback, 0);<br>
<br>
Modified: llvm/trunk/lib/Support/Windows/Signals.inc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/Signals.inc?rev=254363&r1=254362&r2=254363&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/Signals.inc?rev=254363&r1=254362&r2=254363&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Support/Windows/Signals.inc (original)<br>
+++ llvm/trunk/lib/Support/Windows/Signals.inc Mon Nov 30 20:35:04 2015<br>
@@ -405,10 +405,7 @@ static void RegisterHandler() {<br>
   // If we cannot load up the APIs (which would be unexpected as they should<br>
   // exist on every version of Windows we support), we will bail out since<br>
   // there would be nothing to report.<br>
-  if (!load64BitDebugHelp()) {<br>
-    assert(false && "These APIs should always be available");<br>
-    return;<br>
-  }<br>
+  assert(load64BitDebugHelp() && "These APIs should always be available");<br>
<br>
   if (RegisteredUnhandledExceptionFilter) {<br>
     EnterCriticalSection(&CriticalSection);<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>