#define ASSIGN_OR_RETURN_NONE(TYPE, NAME, EXPR) \
auto NAME##Opt = (EXPR); \
if (!NAME##Opt) \
- return None; \
+ return std::nullopt; \
TYPE NAME = std::move(*NAME##Opt)
Optional<MarkupFilter::Module>
TY res = *NAME##View; \
return res; \
} \
- return None; \
+ return std::nullopt; \
}
MCOPT_EXP(bool, RelaxAll)
OS << " MII.getDeprecatedInfo(Inst, getSTI(), Info)) {\n";
OS << " SMLoc Loc = ((" << Target.getName()
<< "Operand &)*Operands[0]).getStartLoc();\n";
- OS << " getParser().Warning(Loc, Info, None);\n";
+ OS << " getParser().Warning(Loc, Info, std::nullopt);\n";
OS << " }\n";
}
StringMatcher Matcher("RuleIdentifier", Cases, OS);
Matcher.Emit();
OS << "#endif // ifndef NDEBUG\n\n"
- << " return None;\n"
+ << " return std::nullopt;\n"
<< "}\n";
}
<< " const auto Last = "
"getRuleIdxForIdentifier(RangePair.second);\n"
<< " if (!First || !Last)\n"
- << " return None;\n"
+ << " return std::nullopt;\n"
<< " if (First >= Last)\n"
<< " report_fatal_error(\"Beginning of range should be before "
"end of range\");\n"
<< " }\n"
<< " const auto I = getRuleIdxForIdentifier(RangePair.first);\n"
<< " if (!I)\n"
- << " return None;\n"
+ << " return std::nullopt;\n"
<< " return {{*I, *I + 1}};\n"
<< "}\n\n";
OS << " };\n";
OS << " return makeArrayRef(Masks);\n";
} else {
- OS << " return None;\n";
+ OS << " return std::nullopt;\n";
}
OS << "}\n\n";
OS << " };\n";
OS << " return makeArrayRef(Names);\n";
} else {
- OS << " return None;\n";
+ OS << " return std::nullopt;\n";
}
OS << "}\n\n";
if (NumFeatures)
OS << Target << "FeatureKV, ";
else
- OS << "None, ";
+ OS << "std::nullopt, ";
if (NumProcs)
OS << Target << "SubTypeKV, ";
else
if (NumFeatures)
OS << "makeArrayRef(" << Target << "FeatureKV, " << NumFeatures << "), ";
else
- OS << "None, ";
+ OS << "std::nullopt, ";
if (NumProcs)
OS << "makeArrayRef(" << Target << "SubTypeKV, " << NumProcs << "), ";
else