<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">The diff is not only the && and || but also the leading !:<div class=""><br class=""></div><div class=""><br class=""></div><div class="">diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp<br class="">index 58f029fbe9fc..7ee06fc153b2 100644<br class="">--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp<br class="">+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp<br class="">@@ -659,7 +659,7 @@ void SelectionDAGISel::CodeGenAndEmitDAG() {<br class=""> (void)BlockNumber;<br class=""> bool MatchFilterBB = false; (void)MatchFilterBB;<br class=""> #ifndef NDEBUG<br class="">- MatchFilterBB = (!FilterDAGBasicBlockName.empty() &&<br class="">+ MatchFilterBB = (FilterDAGBasicBlockName.empty() ||<br class=""> FilterDAGBasicBlockName ==<br class=""> FuncInfo->MBB->getBasicBlock()->getName().str());<br class=""> #endif<br class=""><br class=""><div><br class=""></div><div>— </div><div>Mehdi</div><div><br class=""></div><div><br class=""></div><div><br class=""><blockquote type="cite" class=""><div class="">On Aug 1, 2015, at 11:07 AM, Ryan Taylor <<a href="mailto:ryta1203@gmail.com" class="">ryta1203@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class=""><div class="">Simply replacing the && with || did not fix the issue. This issue still exists after making those changes. There is maybe some other code that needs to be changed also?</div><div class=""><br class=""></div><div class="">Thanks.</div></div><div class="gmail_extra"><br class=""><div class="gmail_quote">On Mon, Jul 27, 2015 at 12:45 PM, Ryan Taylor <span dir="ltr" class=""><<a href="mailto:ryta1203@gmail.com" target="_blank" class="">ryta1203@gmail.com</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr" class=""><div class="">Daniel,</div><div class=""><br class=""></div><div class=""> Ok, thanks. Simple fix. We'll just make correction in local copy for now, one less thing to port later :)</div><div class=""><br class=""></div><div class="">Thanks.</div></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br class=""><div class="gmail_quote">On Mon, Jul 27, 2015 at 12:29 PM, Daniel Sanders <span dir="ltr" class=""><<a href="mailto:Daniel.Sanders@imgtec.com" target="_blank" class="">Daniel.Sanders@imgtec.com</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;padding-left:1ex;border-left-color:rgb(204,204,204);border-left-width:1px;border-left-style:solid">
<div lang="EN-GB" link="blue" vlink="purple" class="">
<div class=""><p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";font-size:11pt" class="">I've just looked at my checkout of 3.6 and it looks like the fix wasn't merged. I don't have the revision number for the fix to hand but in lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp,
this:<u class=""></u><u class=""></u></span></p><p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";font-size:11pt" class=""> MatchFilterBB = (!FilterDAGBasicBlockName.empty() &&<u class=""></u><u class=""></u></span></p><p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";font-size:11pt" class=""> FilterDAGBasicBlockName ==<u class=""></u><u class=""></u></span></p><p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";font-size:11pt" class=""> FuncInfo->MBB->getBasicBlock()->getName().str());<u class=""></u><u class=""></u></span></p><p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";font-size:11pt" class="">Should be:<u class=""></u><u class=""></u></span></p><p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";font-size:11pt" class=""> MatchFilterBB = (FilterDAGBasicBlockName.empty() ||<u class=""></u><u class=""></u></span></p><p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";font-size:11pt" class=""> FilterDAGBasicBlockName ==<u class=""></u><u class=""></u></span></p><p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";font-size:11pt" class=""> FuncInfo->MBB->getBasicBlock()->getName().str());<u class=""></u><u class=""></u></span></p><p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";font-size:11pt" class=""><u class=""></u> <u class=""></u></span></p><p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";font-size:11pt" class="">The trunk has the correct code so the option should be ok for LLVM 3.7.<u class=""></u><u class=""></u></span></p><p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";font-size:11pt" class=""><u class=""></u> <u class=""></u></span></p>
<div style="border-width:medium medium medium 1.5pt;border-style:none none none solid;border-color:currentColor currentColor currentColor blue;padding:0cm 0cm 0cm 4pt" class="">
<div class="">
<div style="border-width:1pt medium medium;border-style:solid none none;border-color:rgb(181,196,223) currentColor currentColor;padding:3pt 0cm 0cm" class=""><p class="MsoNormal"><b class=""><span lang="EN-US" style="font-family:"Tahoma","sans-serif";font-size:10pt" class="">From:</span></b><span lang="EN-US" style="font-family:"Tahoma","sans-serif";font-size:10pt" class=""> Ryan Taylor [mailto:<a href="mailto:ryta1203@gmail.com" target="_blank" class="">ryta1203@gmail.com</a>]
<br class="">
<b class="">Sent:</b> 27 July 2015 17:20<br class="">
<b class="">To:</b> Daniel Sanders<br class="">
<b class="">Cc:</b> <a href="mailto:llvmdev@cs.uiuc.edu" target="_blank" class="">llvmdev@cs.uiuc.edu</a><br class="">
<b class="">Subject:</b> Re: [LLVMdev] SelectionDAG viewers, filter-view-dags question<u class=""></u><u class=""></u></span></p>
</div>
</div><div class=""><div class=""><p class="MsoNormal"><u class=""></u> <u class=""></u></p>
<div class="">
<div class=""><p class="MsoNormal">Daniel,<u class=""></u><u class=""></u></p>
</div>
<div class=""><p class="MsoNormal"><u class=""></u> <u class=""></u></p>
</div>
<div class=""><p class="MsoNormal"> We are using 3.6. Someone also pointed out that it was mandatory in 3.6.2 but I have not verified that.<u class=""></u><u class=""></u></p>
</div>
<div class=""><p class="MsoNormal"><u class=""></u> <u class=""></u></p>
</div>
</div>
<div class=""><p class="MsoNormal"><u class=""></u> <u class=""></u></p>
<div class=""><p class="MsoNormal">On Mon, Jul 27, 2015 at 12:10 PM, Daniel Sanders <<a href="mailto:Daniel.Sanders@imgtec.com" target="_blank" class="">Daniel.Sanders@imgtec.com</a>> wrote:<u class=""></u><u class=""></u></p>
<div class="">
<div class=""><p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";font-size:11pt" class="">It's not supposed to be. There was a short period where it was unintentionally mandatory but this was fixed after
I pointed it out during post-commit review.</span><u class=""></u><u class=""></u></p><p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";font-size:11pt" class=""> </span><u class=""></u><u class=""></u></p><p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";font-size:11pt" class="">Which version/revision are you using?</span><u class=""></u><u class=""></u></p><p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";font-size:11pt" class=""> </span><u class=""></u><u class=""></u></p>
<div style="border-width:medium medium medium 1.5pt;border-style:none none none solid;border-color:currentColor currentColor currentColor blue;padding:0cm 0cm 0cm 4pt" class="">
<div class="">
<div style="border-width:1pt medium medium;border-style:solid none none;border-color:currentColor;padding:3pt 0cm 0cm" class=""><p class="MsoNormal"><b class=""><span lang="EN-US" style="font-family:"Tahoma","sans-serif";font-size:10pt" class="">From:</span></b><span lang="EN-US" style="font-family:"Tahoma","sans-serif";font-size:10pt" class="">
<a href="mailto:llvmdev-bounces@cs.uiuc.edu" target="_blank" class="">llvmdev-bounces@cs.uiuc.edu</a> [mailto:<a href="mailto:llvmdev-bounces@cs.uiuc.edu" target="_blank" class="">llvmdev-bounces@cs.uiuc.edu</a>]
<b class="">On Behalf Of </b>Ryan Taylor<br class="">
<b class="">Sent:</b> 27 July 2015 16:27<br class="">
<b class="">To:</b> <a href="mailto:llvmdev@cs.uiuc.edu" target="_blank" class="">llvmdev@cs.uiuc.edu</a><br class="">
<b class="">Subject:</b> [LLVMdev] SelectionDAG viewers, filter-view-dags question</span><u class=""></u><u class=""></u></p>
</div>
</div>
<div class="">
<div class=""><p class="MsoNormal"> <u class=""></u><u class=""></u></p>
<div class="">
<div class=""><p class="MsoNormal">Is this option currently mandatory? If so, why? If not, I'm not sure what's been added that I need to do differently.<u class=""></u><u class=""></u></p>
</div>
<div class=""><p class="MsoNormal"> <u class=""></u><u class=""></u></p>
</div>
<div class=""><p class="MsoNormal">-view-isel-dags opened just fine in dotty in 3.4 and now this does nothing without the filter-view-dags 'option' and now has a different priority program list or something.<u class=""></u><u class=""></u></p>
</div>
<div class=""><p class="MsoNormal"> <u class=""></u><u class=""></u></p>
</div>
<div class=""><p class="MsoNormal">I'm just curious why this option should be mandatory?<u class=""></u><u class=""></u></p>
</div>
<div class=""><p class="MsoNormal"> <u class=""></u><u class=""></u></p>
</div>
<div class=""><p class="MsoNormal">Thanks.<u class=""></u><u class=""></u></p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div><p class="MsoNormal"><u class=""></u> <u class=""></u></p>
</div>
</div></div></div>
</div>
</div>
</blockquote></div><br class=""></div>
</div></div></blockquote></div><br class=""></div>
_______________________________________________<br class="">LLVM Developers mailing list<br class=""><a href="mailto:LLVMdev@cs.uiuc.edu" class="">LLVMdev@cs.uiuc.edu</a> <a href="http://llvm.cs.uiuc.edu" class="">http://llvm.cs.uiuc.edu</a><br class=""><a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvmdev" class="">http://lists.cs.uiuc.edu/mailman/listinfo/llvmdev</a><br class=""></div></blockquote></div><br class=""></div></body></html>