Merge remote-tracking branch 'apple/master' into master-rebranch

This commit is contained in:
Xi Ge
2020-09-02 18:36:37 -07:00
74 changed files with 1040 additions and 674 deletions

View File

@@ -1128,6 +1128,8 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
Opts.AssumeSingleThreaded = true;
}
Opts.IgnoreAlwaysInline |= Args.hasArg(OPT_ignore_always_inline);
// Parse the assert configuration identifier.
if (const Arg *A = Args.getLastArg(OPT_AssertConfig)) {
StringRef Configuration = A->getValue();