<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Apr 29, 2015 at 12:13 AM, Craig Topper <span dir="ltr"><<a href="mailto:craig.topper@gmail.com" target="_blank">craig.topper@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ctopper<br>
Date: Wed Apr 29 02:13:12 2015<br>
New Revision: 236088<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=236088&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=236088&view=rev</a><br>
Log:<br>
[TableGen] Fold a couple dyn_casts into the ifs that check their results. NFC<br>
<br>
Modified:<br>
    llvm/trunk/lib/TableGen/Record.cpp<br>
<br>
Modified: llvm/trunk/lib/TableGen/Record.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TableGen/Record.cpp?rev=236088&r1=236087&r2=236088&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TableGen/Record.cpp?rev=236088&r1=236087&r2=236088&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/TableGen/Record.cpp (original)<br>
+++ llvm/trunk/lib/TableGen/Record.cpp Wed Apr 29 02:13:12 2015<br>
@@ -1007,21 +1007,18 @@ static Init *ForeachHelper(Init *LHS, In<br>
 static Init *EvaluateOperation(OpInit *RHSo, Init *LHS, Init *Arg,<br>
                                RecTy *Type, Record *CurRec,<br>
                                MultiClass *CurMultiClass) {<br>
-  std::vector<Init *> NewOperands;<br>
-<br>
-  TypedInit *TArg = dyn_cast<TypedInit>(Arg);<br>
-<br>
   // If this is a dag, recurse<br>
-  if (TArg && TArg->getType()->getAsString() == "dag") {<br>
-    Init *Result = ForeachHelper(LHS, Arg, RHSo, Type,<br>
-                                 CurRec, CurMultiClass);<br>
-    return Result;<br>
+  if (TypedInit *TArg = dyn_cast<TypedInit>(Arg)) {<br>
+    if (TArg->getType()->getAsString() == "dag") {<br>
+      Init *Result = ForeachHelper(LHS, Arg, RHSo, Type,<br>
+                                   CurRec, CurMultiClass);<br>
+      return Result;<br></blockquote><div><br>Drop the variable & return the result of the ForeachHelper directly - then you can drop the braces too?<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+    }<br>
   }<br>
<br>
+  std::vector<Init *> NewOperands;<br>
   for (int i = 0; i < RHSo->getNumOperands(); ++i) {<br>
-    OpInit *RHSoo = dyn_cast<OpInit>(RHSo->getOperand(i));<br>
-<br>
-    if (RHSoo) {<br>
+    if (OpInit *RHSoo = dyn_cast<OpInit>(RHSo->getOperand(i))) {<br>
       Init *Result = EvaluateOperation(RHSoo, LHS, Arg,<br>
                                        Type, CurRec, CurMultiClass);<br>
       if (Result) {<br></blockquote><div><br>is this 'if' another candidate for rolling the variable into the condition?<br><br>(optionally, use auto, especially in the dyn_cast cases - since the type name is already mentioned on the RHS)<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<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></div>