@@ -306,7 +306,7 @@ parseSanitizeArgs(const Driver &D, const llvm::opt::ArgList &Args,
306306
307307 Output |= AlwaysIn;
308308 if (!AlwaysOutAdvisoryOnly)
309- Output &= ~AlwaysOut;
309+ Output &= ~AlwaysOut;
310310
311311 return Output;
312312}
@@ -321,9 +321,13 @@ static SanitizerMask parseSanitizeTrapArgs(const Driver &D,
321321 // '-fsanitize=undefined -fsanitize-trap=undefined'
322322 // (clang/test/Driver/fsanitize.c ), which is that vptr is not enabled at all
323323 // (not even in recover mode) in order to avoid the need for a ubsan runtime.
324- return parseSanitizeArgs (D, Args, DiagnoseErrors, TrappingDefault, AlwaysTrap,
325- NeverTrap, options::OPT_fsanitize_trap_EQ,
326- options::OPT_fno_sanitize_trap_EQ, true );
324+ return parseSanitizeArgs (D, Args, DiagnoseErrors,
325+ /* Default */ TrappingDefault,
326+ /* AlwaysIn */ AlwaysTrap,
327+ /* AlwaysOut */ NeverTrap,
328+ /* OptInID */ options::OPT_fsanitize_trap_EQ,
329+ /* OptOutID */ options::OPT_fno_sanitize_trap_EQ,
330+ /* AlwaysOutAdvisoryOnly */ true );
327331}
328332
329333bool SanitizerArgs::needsFuzzerInterceptors () const {
@@ -687,9 +691,13 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC,
687691
688692 // Parse -f(no-)?sanitize-recover flags.
689693 SanitizerMask RecoverableKinds = parseSanitizeArgs (
690- D, Args, DiagnoseErrors, RecoverableByDefault, AlwaysRecoverable,
691- Unrecoverable, options::OPT_fsanitize_recover_EQ,
692- options::OPT_fno_sanitize_recover_EQ, false );
694+ D, Args, DiagnoseErrors,
695+ /* Default */ RecoverableByDefault,
696+ /* AlwaysIn */ AlwaysRecoverable,
697+ /* AlwaysOut */ Unrecoverable,
698+ /* OptInID */ options::OPT_fsanitize_recover_EQ,
699+ /* OptOutID */ options::OPT_fno_sanitize_recover_EQ,
700+ /* AlwaysOutAdvisoryOnly */ false );
693701
694702 RecoverableKinds &= Kinds;
695703
0 commit comments