From bed1965111fc29929e8b282c489e05c857610fb9 Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Thu, 14 May 2015 05:54:02 +0000 Subject: [PATCH] [TableGen] Remove an unnecessary outer 'if' around 3 separate inner ifs. No functional change intended. The outer if had 3 separate conditions ORed together and then the inner ifs detected which of the three conditions it was by using only a portion of the specific condition. Just put the whole condition in each inner if and remove the outer if. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@237343 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/TableGen/Record.cpp | 54 +++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/lib/TableGen/Record.cpp b/lib/TableGen/Record.cpp index a9229175b7a..7229b8c30a3 100644 --- a/lib/TableGen/Record.cpp +++ b/lib/TableGen/Record.cpp @@ -1096,35 +1096,31 @@ Init *TernOpInit::Fold(Record *CurRec, MultiClass *CurMultiClass) const { VarInit *RHSv = dyn_cast(RHS); StringInit *RHSs = dyn_cast(RHS); - if ((LHSd && MHSd && RHSd) || - (LHSv && MHSv && RHSv) || - (LHSs && MHSs && RHSs)) { - if (RHSd) { - Record *Val = RHSd->getDef(); - if (LHSd->getAsString() == RHSd->getAsString()) - Val = MHSd->getDef(); - return DefInit::get(Val); - } - if (RHSv) { - std::string Val = RHSv->getName(); - if (LHSv->getAsString() == RHSv->getAsString()) - Val = MHSv->getName(); - return VarInit::get(Val, getType()); - } - if (RHSs) { - std::string Val = RHSs->getValue(); - - std::string::size_type found; - std::string::size_type idx = 0; - do { - found = Val.find(LHSs->getValue(), idx); - if (found != std::string::npos) - Val.replace(found, LHSs->getValue().size(), MHSs->getValue()); - idx = found + MHSs->getValue().size(); - } while (found != std::string::npos); - - return StringInit::get(Val); - } + if (LHSd && MHSd && RHSd) { + Record *Val = RHSd->getDef(); + if (LHSd->getAsString() == RHSd->getAsString()) + Val = MHSd->getDef(); + return DefInit::get(Val); + } + if (LHSv && MHSv && RHSv) { + std::string Val = RHSv->getName(); + if (LHSv->getAsString() == RHSv->getAsString()) + Val = MHSv->getName(); + return VarInit::get(Val, getType()); + } + if (LHSs && MHSs && RHSs) { + std::string Val = RHSs->getValue(); + + std::string::size_type found; + std::string::size_type idx = 0; + do { + found = Val.find(LHSs->getValue(), idx); + if (found != std::string::npos) + Val.replace(found, LHSs->getValue().size(), MHSs->getValue()); + idx = found + MHSs->getValue().size(); + } while (found != std::string::npos); + + return StringInit::get(Val); } break; } -- 2.34.1