TEST: Try removing -internal-iframework to see the consequences. I would swear this totally didn't work previously

Author: ldionne

clang/include/clang/Driver/Options.td

@@ -3218,7 +3218,7 @@ def modules_reduced_bmi : Flag<["-"], "fmodules-reduced-bmi">,
   HelpText<"Generate the reduced BMI">,
   MarshallingInfoFlag<FrontendOpts<"GenReducedBMI">>;
 
-def experimental_modules_reduced_bmi : Flag<["-"], "fexperimental-modules-reduced-bmi">, 
+def experimental_modules_reduced_bmi : Flag<["-"], "fexperimental-modules-reduced-bmi">,
   Group<f_Group>, Visibility<[ClangOption, CC1Option]>, Alias<modules_reduced_bmi>;
 
 def fmodules_embed_all_files : Joined<["-"], "fmodules-embed-all-files">,
@@ -7421,7 +7421,7 @@ def fuse_register_sized_bitfield_access: Flag<["-"], "fuse-register-sized-bitfie
 def relaxed_aliasing : Flag<["-"], "relaxed-aliasing">,
   HelpText<"Turn off Type Based Alias Analysis">,
   MarshallingInfoFlag<CodeGenOpts<"RelaxedAliasing">>;
-defm pointer_tbaa: BoolOption<"", "pointer-tbaa", CodeGenOpts<"PointerTBAA">, 
+defm pointer_tbaa: BoolOption<"", "pointer-tbaa", CodeGenOpts<"PointerTBAA">,
 DefaultTrue,
   PosFlag<SetTrue, [], [ClangOption], "Enable">,
   NegFlag<SetFalse, [], [ClangOption], "Disable">,
@@ -8298,11 +8298,6 @@ def internal_externc_isystem : Separate<["-"], "internal-externc-isystem">,
            "implicit extern \"C\" semantics; these are assumed to not be "
            "user-provided and are used to model system and standard headers' "
            "paths.">;
-def internal_iframework : Separate<["-"], "internal-iframework">,
-  MetaVarName<"<directory>">,
-  HelpText<"Add directory to the internal system framework include search path; these "
-           "are assumed to not be user-provided and are used to model system "
-           "and standard frameworks' paths.">;
 
 } // let Visibility = [CC1Option]
 

clang/lib/Driver/Job.cpp

@@ -73,7 +73,7 @@ static bool skipArgs(const char *Flag, bool HaveCrashVFS, int &SkipNum,
     .Cases("-internal-externc-isystem", "-iprefix", true)
     .Cases("-iwithprefixbefore", "-isystem", "-iquote", true)
     .Cases("-isysroot", "-I", "-F", "-resource-dir", true)
-    .Cases("-internal-iframework", "-iframework", "-include-pch", true)
+    .Cases("-iframework", "-include-pch", true)
     .Default(false);
   if (IsInclude)
     return !HaveCrashVFS;

clang/lib/Driver/ToolChains/Darwin.cpp

@@ -2566,9 +2566,9 @@ void DarwinClang::AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs
     CC1Args.push_back(DriverArgs.MakeArgString(Flag));
     CC1Args.push_back(DriverArgs.MakeArgString(P));
   };
-  AddFrameworkInclude("-internal-iframework", "/System/Library/Frameworks");
-  AddFrameworkInclude("-internal-iframework", "/System/Library/SubFrameworks");
-  AddFrameworkInclude("-internal-iframework", "/Library/Frameworks");
+  AddFrameworkInclude("-iframework", "/System/Library/Frameworks");
+  AddFrameworkInclude("-iframework", "/System/Library/SubFrameworks");
+  AddFrameworkInclude("-iframework", "/Library/Frameworks");
 }
 
 bool DarwinClang::AddGnuCPlusPlusIncludePaths(const llvm::opt::ArgList &DriverArgs,

clang/lib/Frontend/CompilerInvocation.cpp

@@ -3310,8 +3310,6 @@ static void GenerateHeaderSearchArgs(const HeaderSearchOptions &Opts,
                            : OPT_internal_externc_isystem;
     GenerateArg(Consumer, Opt, It->Path);
   }
-  for (; It < End && Matches(*It, {frontend::System}, true, true); ++It)
-    GenerateArg(Consumer, OPT_internal_iframework, It->Path);
 
   assert(It == End && "Unhandled HeaderSearchOption::Entry.");
 
@@ -3438,14 +3436,11 @@ static bool ParseHeaderSearchArgs(HeaderSearchOptions &Opts, ArgList &Args,
 
   // Add the internal paths from a driver that detects standard include paths.
   for (const auto *A :
-       Args.filtered(OPT_internal_isystem, OPT_internal_externc_isystem, OPT_internal_iframework)) {
+       Args.filtered(OPT_internal_isystem, OPT_internal_externc_isystem)) {
     frontend::IncludeDirGroup Group = frontend::System;
-    bool IsFramework = false;
     if (A->getOption().matches(OPT_internal_externc_isystem))
       Group = frontend::ExternCSystem;
-    if (A->getOption().matches(OPT_internal_iframework))
-      IsFramework = true;
-    Opts.AddPath(A->getValue(), Group, IsFramework, true);
+    Opts.AddPath(A->getValue(), Group, false, true);
   }
 
   // Add the path prefixes which are implicitly treated as being system headers.

clang/test/Driver/darwin-framework-search-paths.c

@@ -14,13 +14,13 @@
 //
 // CHECK-C:    "-isysroot" "[[SDKROOT]]"
 // CHECK-C:    "-internal-externc-isystem" "[[SDKROOT]]/usr/include"
-// CHECK-C:    "-internal-iframework" "[[SDKROOT]]/System/Library/Frameworks"
-// CHECK-C:    "-internal-iframework" "[[SDKROOT]]/System/Library/SubFrameworks"
+// CHECK-C:    "-iframework" "[[SDKROOT]]/System/Library/Frameworks"
+// CHECK-C:    "-iframework" "[[SDKROOT]]/System/Library/SubFrameworks"
 
 // RUN: %clang -xc++ %s -target arm64-apple-macosx15.1 -isysroot %t/MacOSX15.1.sdk -c -### 2>&1 \
 // RUN: | FileCheck -DSDKROOT=%t/MacOSX15.1.sdk --check-prefix=CHECK-CXX %s
 //
 // CHECK-CXX:    "-isysroot" "[[SDKROOT]]"
 // CHECK-CXX:    "-internal-externc-isystem" "[[SDKROOT]]/usr/include"
-// CHECK-CXX:    "-internal-iframework" "[[SDKROOT]]/System/Library/Frameworks"
-// CHECK-CXX:    "-internal-iframework" "[[SDKROOT]]/System/Library/SubFrameworks"
+// CHECK-CXX:    "-iframework" "[[SDKROOT]]/System/Library/Frameworks"
+// CHECK-CXX:    "-iframework" "[[SDKROOT]]/System/Library/SubFrameworks"

clang/test/Driver/driverkit-path.c

@@ -31,5 +31,5 @@ int main() { return 0; }
 // INC:       "-internal-isystem" "[[SDKROOT]]/System/DriverKit/usr/local/include"
 // INC:       "-internal-isystem" "{{.+}}/lib{{(64)?}}/clang/{{[^/ ]+}}/include"
 // INC:       "-internal-externc-isystem" "[[SDKROOT]]/System/DriverKit/usr/include"
-// INC:       "-internal-iframework" "[[SDKROOT]]/System/DriverKit/System/Library/Frameworks"
-// INC:       "-internal-iframework" "[[SDKROOT]]/System/DriverKit/System/Library/SubFrameworks"
+// INC:       "-iframework" "[[SDKROOT]]/System/DriverKit/System/Library/Frameworks"
+// INC:       "-iframework" "[[SDKROOT]]/System/DriverKit/System/Library/SubFrameworks"