<div dir="ltr">Ah, I wasn't clear on what you meant by "escape" - avoid/remove? Sure sure, seems good. Thanks! :)</div><br><div class="gmail_quote"><div dir="ltr">On Mon, Jun 4, 2018 at 1:50 PM Simon Atanasyan <<a href="mailto:simon@atanasyan.com">simon@atanasyan.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I hope the change is just refactoring and does not change any functionality.<br>
<br>
On Mon, Jun 4, 2018 at 7:57 PM, David Blaikie <<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>> wrote:<br>
> Test case?<br>
><br>
> On Tue, May 29, 2018 at 2:55 AM Simon Atanasyan via llvm-commits<br>
> <<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br>
>><br>
>> Author: atanasyan<br>
>> Date: Tue May 29 02:51:28 2018<br>
>> New Revision: 333403<br>
>><br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=333403&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=333403&view=rev</a><br>
>> Log:<br>
>> [mips] Escape else-after-return. NFC<br>
>><br>
>> Modified:<br>
>> llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp<br>
>><br>
>> Modified: llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp<br>
>> URL:<br>
>> <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp?rev=333403&r1=333402&r2=333403&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp?rev=333403&r1=333402&r2=333403&view=diff</a><br>
>><br>
>> ==============================================================================<br>
>> --- llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp (original)<br>
>> +++ llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp Tue May 29<br>
>> 02:51:28 2018<br>
>> @@ -7210,130 +7210,131 @@ bool MipsAsmParser::parseDirectiveNaN()<br>
>> }<br>
>><br>
>> bool MipsAsmParser::parseDirectiveSet() {<br>
>> - MCAsmParser &Parser = getParser();<br>
>> - // Get the next token.<br>
>> - const AsmToken &Tok = Parser.getTok();<br>
>> + const AsmToken &Tok = getParser().getTok();<br>
>> + StringRef IdVal = Tok.getString();<br>
>> + SMLoc Loc = Tok.getLoc();<br>
>><br>
>> - if (Tok.getString() == "noat") {<br>
>> + if (IdVal == "noat")<br>
>> return parseSetNoAtDirective();<br>
>> - } else if (Tok.getString() == "at") {<br>
>> + if (IdVal == "at")<br>
>> return parseSetAtDirective();<br>
>> - } else if (Tok.getString() == "arch") {<br>
>> + if (IdVal == "arch")<br>
>> return parseSetArchDirective();<br>
>> - } else if (Tok.getString() == "bopt") {<br>
>> - Warning(Tok.getLoc(), "'bopt' feature is unsupported");<br>
>> + if (IdVal == "bopt") {<br>
>> + Warning(Loc, "'bopt' feature is unsupported");<br>
>> getParser().Lex();<br>
>> return false;<br>
>> - } else if (Tok.getString() == "nobopt") {<br>
>> + }<br>
>> + if (IdVal == "nobopt") {<br>
>> // We're already running in nobopt mode, so nothing to do.<br>
>> getParser().Lex();<br>
>> return false;<br>
>> - } else if (Tok.getString() == "fp") {<br>
>> + }<br>
>> + if (IdVal == "fp")<br>
>> return parseSetFpDirective();<br>
>> - } else if (Tok.getString() == "oddspreg") {<br>
>> + if (IdVal == "oddspreg")<br>
>> return parseSetOddSPRegDirective();<br>
>> - } else if (Tok.getString() == "nooddspreg") {<br>
>> + if (IdVal == "nooddspreg")<br>
>> return parseSetNoOddSPRegDirective();<br>
>> - } else if (Tok.getString() == "pop") {<br>
>> + if (IdVal == "pop")<br>
>> return parseSetPopDirective();<br>
>> - } else if (Tok.getString() == "push") {<br>
>> + if (IdVal == "push")<br>
>> return parseSetPushDirective();<br>
>> - } else if (Tok.getString() == "reorder") {<br>
>> + if (IdVal == "reorder")<br>
>> return parseSetReorderDirective();<br>
>> - } else if (Tok.getString() == "noreorder") {<br>
>> + if (IdVal == "noreorder")<br>
>> return parseSetNoReorderDirective();<br>
>> - } else if (Tok.getString() == "macro") {<br>
>> + if (IdVal == "macro")<br>
>> return parseSetMacroDirective();<br>
>> - } else if (Tok.getString() == "nomacro") {<br>
>> + if (IdVal == "nomacro")<br>
>> return parseSetNoMacroDirective();<br>
>> - } else if (Tok.getString() == "mips16") {<br>
>> + if (IdVal == "mips16")<br>
>> return parseSetMips16Directive();<br>
>> - } else if (Tok.getString() == "nomips16") {<br>
>> + if (IdVal == "nomips16")<br>
>> return parseSetNoMips16Directive();<br>
>> - } else if (Tok.getString() == "nomicromips") {<br>
>> + if (IdVal == "nomicromips") {<br>
>> clearFeatureBits(Mips::FeatureMicroMips, "micromips");<br>
>> getTargetStreamer().emitDirectiveSetNoMicroMips();<br>
>> - Parser.eatToEndOfStatement();<br>
>> + getParser().eatToEndOfStatement();<br>
>> return false;<br>
>> - } else if (Tok.getString() == "micromips") {<br>
>> + }<br>
>> + if (IdVal == "micromips") {<br>
>> if (hasMips64r6()) {<br>
>> - Error(Tok.getLoc(),<br>
>> - ".set micromips directive is not supported with MIPS64R6");<br>
>> + Error(Loc, ".set micromips directive is not supported with<br>
>> MIPS64R6");<br>
>> return false;<br>
>> }<br>
>> return parseSetFeature(Mips::FeatureMicroMips);<br>
>> - } else if (Tok.getString() == "mips0") {<br>
>> + }<br>
>> + if (IdVal == "mips0")<br>
>> return parseSetMips0Directive();<br>
>> - } else if (Tok.getString() == "mips1") {<br>
>> + if (IdVal == "mips1")<br>
>> return parseSetFeature(Mips::FeatureMips1);<br>
>> - } else if (Tok.getString() == "mips2") {<br>
>> + if (IdVal == "mips2")<br>
>> return parseSetFeature(Mips::FeatureMips2);<br>
>> - } else if (Tok.getString() == "mips3") {<br>
>> + if (IdVal == "mips3")<br>
>> return parseSetFeature(Mips::FeatureMips3);<br>
>> - } else if (Tok.getString() == "mips4") {<br>
>> + if (IdVal == "mips4")<br>
>> return parseSetFeature(Mips::FeatureMips4);<br>
>> - } else if (Tok.getString() == "mips5") {<br>
>> + if (IdVal == "mips5")<br>
>> return parseSetFeature(Mips::FeatureMips5);<br>
>> - } else if (Tok.getString() == "mips32") {<br>
>> + if (IdVal == "mips32")<br>
>> return parseSetFeature(Mips::FeatureMips32);<br>
>> - } else if (Tok.getString() == "mips32r2") {<br>
>> + if (IdVal == "mips32r2")<br>
>> return parseSetFeature(Mips::FeatureMips32r2);<br>
>> - } else if (Tok.getString() == "mips32r3") {<br>
>> + if (IdVal == "mips32r3")<br>
>> return parseSetFeature(Mips::FeatureMips32r3);<br>
>> - } else if (Tok.getString() == "mips32r5") {<br>
>> + if (IdVal == "mips32r5")<br>
>> return parseSetFeature(Mips::FeatureMips32r5);<br>
>> - } else if (Tok.getString() == "mips32r6") {<br>
>> + if (IdVal == "mips32r6")<br>
>> return parseSetFeature(Mips::FeatureMips32r6);<br>
>> - } else if (Tok.getString() == "mips64") {<br>
>> + if (IdVal == "mips64")<br>
>> return parseSetFeature(Mips::FeatureMips64);<br>
>> - } else if (Tok.getString() == "mips64r2") {<br>
>> + if (IdVal == "mips64r2")<br>
>> return parseSetFeature(Mips::FeatureMips64r2);<br>
>> - } else if (Tok.getString() == "mips64r3") {<br>
>> + if (IdVal == "mips64r3")<br>
>> return parseSetFeature(Mips::FeatureMips64r3);<br>
>> - } else if (Tok.getString() == "mips64r5") {<br>
>> + if (IdVal == "mips64r5")<br>
>> return parseSetFeature(Mips::FeatureMips64r5);<br>
>> - } else if (Tok.getString() == "mips64r6") {<br>
>> + if (IdVal == "mips64r6") {<br>
>> if (inMicroMipsMode()) {<br>
>> - Error(Tok.getLoc(), "MIPS64R6 is not supported with microMIPS");<br>
>> + Error(Loc, "MIPS64R6 is not supported with microMIPS");<br>
>> return false;<br>
>> }<br>
>> return parseSetFeature(Mips::FeatureMips64r6);<br>
>> - } else if (Tok.getString() == "dsp") {<br>
>> + }<br>
>> + if (IdVal == "dsp")<br>
>> return parseSetFeature(Mips::FeatureDSP);<br>
>> - } else if (Tok.getString() == "dspr2") {<br>
>> + if (IdVal == "dspr2")<br>
>> return parseSetFeature(Mips::FeatureDSPR2);<br>
>> - } else if (Tok.getString() == "nodsp") {<br>
>> + if (IdVal == "nodsp")<br>
>> return parseSetNoDspDirective();<br>
>> - } else if (Tok.getString() == "msa") {<br>
>> + if (IdVal == "msa")<br>
>> return parseSetMsaDirective();<br>
>> - } else if (Tok.getString() == "nomsa") {<br>
>> + if (IdVal == "nomsa")<br>
>> return parseSetNoMsaDirective();<br>
>> - } else if (Tok.getString() == "mt") {<br>
>> + if (IdVal == "mt")<br>
>> return parseSetMtDirective();<br>
>> - } else if (Tok.getString() == "nomt") {<br>
>> + if (IdVal == "nomt")<br>
>> return parseSetNoMtDirective();<br>
>> - } else if (Tok.getString() == "softfloat") {<br>
>> + if (IdVal == "softfloat")<br>
>> return parseSetSoftFloatDirective();<br>
>> - } else if (Tok.getString() == "hardfloat") {<br>
>> + if (IdVal == "hardfloat")<br>
>> return parseSetHardFloatDirective();<br>
>> - } else if (Tok.getString() == "crc") {<br>
>> + if (IdVal == "crc")<br>
>> return parseSetFeature(Mips::FeatureCRC);<br>
>> - } else if (Tok.getString() == "nocrc") {<br>
>> + if (IdVal == "nocrc")<br>
>> return parseSetNoCRCDirective();<br>
>> - } else if (Tok.getString() == "virt") {<br>
>> + if (IdVal == "virt")<br>
>> return parseSetFeature(Mips::FeatureVirt);<br>
>> - } else if (Tok.getString() == "novirt") {<br>
>> + if (IdVal == "novirt")<br>
>> return parseSetNoVirtDirective();<br>
>> - } else if (Tok.getString() == "ginv") {<br>
>> + if (IdVal == "ginv")<br>
>> return parseSetFeature(Mips::FeatureGINV);<br>
>> - } else if (Tok.getString() == "noginv") {<br>
>> + if (IdVal == "noginv")<br>
>> return parseSetNoGINVDirective();<br>
>> - } else {<br>
>> - // It is just an identifier, look for an assignment.<br>
>> - return parseSetAssignment();<br>
>> - }<br>
>><br>
>> - return true;<br>
>> + // It is just an identifier, look for an assignment.<br>
>> + return parseSetAssignment();<br>
>> }<br>
>><br>
>> /// parseDataDirective<br>
>><br>
>><br>
>> _______________________________________________<br>
>> llvm-commits mailing list<br>
>> <a href="mailto:llvm-commits@lists.llvm.org" target="_blank">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>
<br>
<br>
<br>
-- <br>
Simon Atanasyan<br>
</blockquote></div>