Remove the introduced feature flag

AaronBallman · AaronBallman · commit b304523f1788 · 2025-06-04T06:47:25.000-04:00
diff --git a/clang/include/clang/Basic/LangOptions.def b/clang/include/clang/Basic/LangOptions.def
@@ -534,12 +534,6 @@ LANGOPT(BoundsSafety, 1, 0, "Bounds safety extension for C")
 
 LANGOPT(PreserveVec3Type, 1, 0, "Preserve 3-component vector type")
 
-COMPATIBLE_LANGOPT(DelayedTypoCorrection, 1, 0, "True if we want to allow "
-                   "delayed typo correction. This can improve typo correction "
-                   "behavior in C++, particularly around template "
-                   "instantiations, but comes at the expense of potentially "
-                   "crashing Clang.")
-
 #undef LANGOPT
 #undef COMPATIBLE_LANGOPT
 #undef BENIGN_LANGOPT
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
@@ -2025,9 +2025,6 @@ def fcrash_diagnostics_dir : Joined<["-"], "fcrash-diagnostics-dir=">,
   Group<f_clang_Group>, Flags<[NoArgumentUnused]>,
   Visibility<[ClangOption, CLOption, DXCOption]>,
   HelpText<"Put crash-report files in <dir>">, MetaVarName<"<dir>">;
-def fdelayed_typo_correction : Flag<["-"], "fdelayed-typo-correction">, Group<f_clang_Group>,
-  HelpText<"Enable delayed typo correction">, Visibility<[CC1Option]>,
-  MarshallingInfoFlag<LangOpts<"DelayedTypoCorrection">>;
 def fcreate_profile : Flag<["-"], "fcreate-profile">, Group<f_Group>;
 defm cxx_exceptions: BoolFOption<"cxx-exceptions",
   LangOpts<"CXXExceptions">, DefaultFalse,
diff --git a/clang/test/FixIt/fixit-unicode.c b/clang/test/FixIt/fixit-unicode.c
@@ -2,8 +2,8 @@
 // There's a set of additional checks for systems with proper support of UTF-8
 // on the standard output in fixit-unicode-with-utf8-output.c.
 
-// RUN: not %clang_cc1 -fsyntax-only -fdelayed-typo-correction -fno-diagnostics-show-line-numbers %s 2>&1 | FileCheck -strict-whitespace %s
-// RUN: not %clang_cc1 -fsyntax-only -fdelayed-typo-correction -fno-diagnostics-show-line-numbers -fdiagnostics-parseable-fixits %s 2>&1 | FileCheck -check-prefix=CHECK-MACHINE %s
+// RUN: not %clang_cc1 -fsyntax-only -fno-diagnostics-show-line-numbers %s 2>&1 | FileCheck -strict-whitespace %s
+// RUN: not %clang_cc1 -fsyntax-only -fno-diagnostics-show-line-numbers -fdiagnostics-parseable-fixits %s 2>&1 | FileCheck -check-prefix=CHECK-MACHINE %s
 
 struct Foo {
   int bar;
diff --git a/clang/test/FixIt/fixit.c b/clang/test/FixIt/fixit.c
@@ -1,6 +1,6 @@
-// RUN: %clang_cc1 -pedantic -Wunused-label -Wno-deprecated-non-prototype -fdelayed-typo-correction -verify -x c %s
+// RUN: %clang_cc1 -pedantic -Wunused-label -Wno-deprecated-non-prototype -verify -x c %s
 // RUN: cp %s %t
-// RUN: not %clang_cc1 -pedantic -Wunused-label -fdelayed-typo-correction -fixit -x c %t
+// RUN: not %clang_cc1 -pedantic -Wunused-label -fixit -x c %t
 // RUN: %clang_cc1 -pedantic -Wunused-label -Wno-deprecated-non-prototype -Werror -x c %t
 // RUN: grep -v CHECK %t | FileCheck %t
 
diff --git a/clang/test/FixIt/typo-location-bugs.cpp b/clang/test/FixIt/typo-location-bugs.cpp
@@ -1,6 +1,6 @@
-// RUN: %clang_cc1 -fsyntax-only -fdelayed-typo-correction -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 // RUN: cp %s %t
-// RUN: not %clang_cc1 -fdelayed-typo-correction -fixit -x c++ %t
+// RUN: not %clang_cc1 -fixit -x c++ %t
 // RUN: %clang_cc1 -fsyntax-only -pedantic -Werror -x c++ %t
 
 namespace dcl_fct_default_p10 {
diff --git a/clang/test/Misc/serialized-diags.m b/clang/test/Misc/serialized-diags.m
@@ -11,7 +11,7 @@ - (void) test2 {}
 @end
 
 // RUN: rm -f %t
-// RUN: not %clang -Wall -Xclang -fdelayed-typo-correction -fsyntax-only %s --serialize-diagnostics %t.diag > /dev/null 2>&1
+// RUN: not %clang -Wall -fsyntax-only %s --serialize-diagnostics %t.diag > /dev/null 2>&1
 // RUN: c-index-test -read-diagnostics %t.diag > %t 2>&1
 // RUN: FileCheck --input-file=%t %s
 
diff --git a/clang/test/Modules/crash-typo-correction-visibility.cpp b/clang/test/Modules/crash-typo-correction-visibility.cpp
@@ -1,6 +1,6 @@
 // RUN: mkdir -p %t
-// RUN: %clang_cc1 -x c++ -std=c++11 -fdelayed-typo-correction -fmodules -fmodule-name=module -o %t/module.pcm -emit-module %S/Inputs/crash-typo-correction-visibility/module.modulemap
-// RUN: %clang_cc1 -x c++ -std=c++11 -fdelayed-typo-correction -fmodules -fmodule-file=%t/module.pcm %s -verify
+// RUN: %clang_cc1 -x c++ -std=c++11 -fmodules -fmodule-name=module -o %t/module.pcm -emit-module %S/Inputs/crash-typo-correction-visibility/module.modulemap
+// RUN: %clang_cc1 -x c++ -std=c++11 -fmodules -fmodule-file=%t/module.pcm %s -verify
 
 struct S {
   int member; // expected-note {{declared here}}
diff --git a/clang/test/Modules/diagnose-missing-import.m b/clang/test/Modules/diagnose-missing-import.m
@@ -1,6 +1,6 @@
 // RUN: rm -rf %t
 // RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -I%S/Inputs/diagnose-missing-import \
-// RUN:   -Werror=implicit-function-declaration -fsyntax-only -fdelayed-typo-correction \
+// RUN:   -Werror=implicit-function-declaration -fsyntax-only \
 // RUN:   -fimplicit-module-maps -verify %s
 @import NCI;
 
diff --git a/clang/test/Modules/suggest-include.cpp b/clang/test/Modules/suggest-include.cpp
@@ -1,5 +1,5 @@
 // RUN: rm -rf %t
-// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -fimplicit-module-maps -fdelayed-typo-correction -I%S/Inputs/suggest-include %s -verify
+// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -fimplicit-module-maps -I%S/Inputs/suggest-include %s -verify
 
 #include "empty.h" // import the module file
 
diff --git a/clang/test/Parser/switch-recovery.cpp b/clang/test/Parser/switch-recovery.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fdelayed-typo-correction -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 struct A {};
 struct B {
diff --git a/clang/test/Parser/switch-typo-correction.cpp b/clang/test/Parser/switch-typo-correction.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fdelayed-typo-correction -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 namespace c { double xxx; }
 namespace d { float xxx; }
diff --git a/clang/test/Sema/typo-correction-ambiguity.c b/clang/test/Sema/typo-correction-ambiguity.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fdelayed-typo-correction -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 // Check the following typo correction behavior in C:
 // - no typos are diagnosed when a call expression has ambiguous (multiple) corrections
diff --git a/clang/test/SemaCXX/cxx11-crashes.cpp b/clang/test/SemaCXX/cxx11-crashes.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -std=c++11 -fdelayed-typo-correction -verify %s -Wno-deprecated-builtins
+// RUN: %clang_cc1 -std=c++11 -verify %s -Wno-deprecated-builtins
 
 namespace rdar12240916 {
 
diff --git a/clang/test/SemaCXX/missing-namespace-qualifier-typo-corrections.cpp b/clang/test/SemaCXX/missing-namespace-qualifier-typo-corrections.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -verify -fdelayed-typo-correction -Wno-c++11-extensions %s
+// RUN: %clang_cc1 -fsyntax-only -verify -Wno-c++11-extensions %s
 
 namespace fizbin { class Foobar {}; } // expected-note 2 {{'fizbin::Foobar' declared here}} \
                                       // expected-note {{'Foobar' declared here}}
diff --git a/clang/test/SemaCXX/typo-correction-blocks.c b/clang/test/SemaCXX/typo-correction-blocks.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple i386-apple-macosx -fblocks -fsyntax-only -fdelayed-typo-correction -verify %s
+// RUN: %clang_cc1 -triple i386-apple-macosx -fblocks -fsyntax-only -verify %s
 
 extern int h(int *);
 extern void g(int, void (^)(void));
diff --git a/clang/test/SemaObjCXX/typo-correction.mm b/clang/test/SemaObjCXX/typo-correction.mm
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -verify -fsyntax-only -fdelayed-typo-correction -Wno-objc-root-class
+// RUN: %clang_cc1 %s -verify -fsyntax-only -Wno-objc-root-class
 
 class ClassA {};
 
diff --git a/clang/test/SemaTemplate/concepts-recovery-expr.cpp b/clang/test/SemaTemplate/concepts-recovery-expr.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -std=c++20 -fdelayed-typo-correction -verify %s
+// RUN: %clang_cc1 -std=c++20 -verify %s
 
 // expected-error@+1{{use of undeclared identifier 'b'}}
 constexpr bool CausesRecoveryExpr = b;
diff --git a/clang/test/SemaTemplate/dependent-typos-recovery.cpp b/clang/test/SemaTemplate/dependent-typos-recovery.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fdelayed-typo-correction -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 // There should be no extra errors about missing 'template' keywords.
 struct B {
diff --git a/clang/unittests/Sema/ExternalSemaSourceTest.cpp b/clang/unittests/Sema/ExternalSemaSourceTest.cpp
@@ -268,20 +268,6 @@ TEST(ExternalSemaSource, ExternalTypoCorrectionOrdering) {
   ASSERT_EQ(1, Watcher.SeenCount);
 }
 
-TEST(ExternalSemaSource, ExternalDelayedTypoCorrection) {
-  auto Installer = std::make_unique<ExternalSemaSourceInstaller>();
-  auto Provider = makeIntrusiveRefCnt<FunctionTypoProvider>("aaa", "bbb");
-  DiagnosticWatcher Watcher("aaa", "bbb");
-  Installer->PushSource(Provider.get());
-  Installer->PushWatcher(&Watcher);
-  std::vector<std::string> Args{"-std=c++11", "-fdelayed-typo-correction"};
-  ASSERT_TRUE(clang::tooling::runToolOnCodeWithArgs(
-      std::move(Installer), "namespace AAA { } void foo() { AAA::aaa(); }",
-      Args));
-  ASSERT_LE(0, Provider->CallCount);
-  ASSERT_EQ(1, Watcher.SeenCount);
-}
-
 // We should only try MaybeDiagnoseMissingCompleteType if we can't otherwise
 // solve the problem.
 TEST(ExternalSemaSource, TryOtherTacticsBeforeDiagnosing) {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %clang_cc1 -fsyntax-only -fdelayed-typo-correction -verify %s`
	`1`	`+// RUN: %clang_cc1 -fsyntax-only -verify %s`
`2`	`2`
`3`	`3`	`struct A {};`
`4`	`4`	`struct B {`