Revert "[misexpect] Re-implement MisExpect Diagnostics"

This reverts commit 2add3fbd976d7b80a3a7fc14ef0deb9b1ca6beee.

1 files changed, 0 insertions, 41 deletions

diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index 714660f..f8fd3a29 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -107,20 +107,6 @@ using namespace options;
 using namespace llvm::opt;
 
 //===----------------------------------------------------------------------===//
-// Helpers.
-//===----------------------------------------------------------------------===//
-
-// Parse misexpect tolerance argument value.
-// Valid option values are integers in the range [0, 100)
-inline Expected<Optional<uint64_t>> parseToleranceOption(StringRef Arg) {
-  int64_t Val;
-  if (Arg.getAsInteger(10, Val))
-    return llvm::createStringError(llvm::inconvertibleErrorCode(),
-                                   "Not an integer: %s", Arg.data());
-  return Val;
-}
-
-//===----------------------------------------------------------------------===//
 // Initialization.
 //===----------------------------------------------------------------------===//
 
@@ -1549,9 +1535,6 @@ void CompilerInvocation::GenerateCodeGenArgs(
                   : "auto",
               SA);
 
-  GenerateArg(Args, OPT_fdiagnostics_misexpect_tolerance_EQ,
-              Twine(*Opts.DiagnosticsMisExpectTolerance), SA);
-
   for (StringRef Sanitizer : serializeSanitizerKinds(Opts.SanitizeRecover))
     GenerateArg(Args, OPT_fsanitize_recover_EQ, Sanitizer, SA);
 
@@ -1969,23 +1952,6 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args,
     }
   }
 
-  if (auto *arg =
-          Args.getLastArg(options::OPT_fdiagnostics_misexpect_tolerance_EQ)) {
-    auto ResultOrErr = parseToleranceOption(arg->getValue());
-
-    if (!ResultOrErr) {
-      Diags.Report(diag::err_drv_invalid_diagnotics_misexpect_tolerance)
-          << "-fdiagnostics-misexpect-tolerance=";
-    } else {
-      Opts.DiagnosticsMisExpectTolerance = *ResultOrErr;
-      if ((!Opts.DiagnosticsMisExpectTolerance.hasValue() ||
-           Opts.DiagnosticsMisExpectTolerance.getValue() > 0) &&
-          !UsingProfile)
-        Diags.Report(diag::warn_drv_diagnostics_misexpect_requires_pgo)
-            << "-fdiagnostics-misexpect-tolerance=";
-    }
-  }
-
   // If the user requested to use a sample profile for PGO, then the
   // backend will need to track source location information so the profile
   // can be incorporated into the IR.
@@ -4611,13 +4577,6 @@ bool CompilerInvocation::CreateFromArgsImpl(
   if (Res.getFrontendOpts().ProgramAction == frontend::RewriteObjC)
     LangOpts.ObjCExceptions = 1;
 
-  for (auto Warning : Res.getDiagnosticOpts().Warnings) {
-    if (Warning == "misexpect" &&
-        !Diags.isIgnored(diag::warn_profile_data_misexpect, SourceLocation())) {
-      Res.getCodeGenOpts().MisExpect = true;
-    }
-  }
-
   if (LangOpts.CUDA) {
     // During CUDA device-side compilation, the aux triple is the
     // triple used for host compilation.