Skip to content

Commit 408ac28

Browse files
ian-twilightcoderian-twilightcoder
committed
Revert "Merge pull request swiftlang#7618 from ian-twilightcoder/builtin-flag"
Swift needs to make some changes before taking this change. This reverts commit 957fe28, reversing changes made to e2c29b5.
1 parent 6000670 commit 408ac28

File tree

17 files changed

+51
-148
lines changed

17 files changed

+51
-148
lines changed

‎clang/include/clang/Basic/Features.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ EXTENSION(matrix_types, LangOpts.MatrixTypes)
285285
EXTENSION(matrix_types_scalar_division, true)
286286
EXTENSION(cxx_attributes_on_using_declarations, LangOpts.CPlusPlus11)
287287

288-
FEATURE(builtin_headers_in_system_modules, LangOpts.BuiltinHeadersInSystemModules)
289288
FEATURE(cxx_abi_relative_vtable, LangOpts.CPlusPlus && LangOpts.RelativeCXXABIVTables)
290289

291290
// CUDA/HIP Features

‎clang/include/clang/Basic/LangOptions.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ LANGOPT(MathErrno , 1, 1, "errno in math functions")
184184
BENIGN_LANGOPT(HeinousExtensions , 1, 0, "extensions that we really don't like and may be ripped out at any time")
185185
LANGOPT(Modules , 1, 0, "modules semantics")
186186
COMPATIBLE_LANGOPT(CPlusPlusModules, 1, 0, "C++ modules syntax")
187-
LANGOPT(BuiltinHeadersInSystemModules, 1, 0, "builtin headers belong to system modules, and _Builtin_ modules are ignored for cstdlib headers")
188187
BENIGN_ENUM_LANGOPT(CompilingModule, CompilingModuleKind, 3, CMK_None,
189188
"compiling a module interface")
190189
BENIGN_LANGOPT(CompilingPCH, 1, 0, "building a pch")

‎clang/include/clang/Driver/Options.td

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2597,12 +2597,6 @@ defm modules : BoolFOption<"modules",
25972597
LangOpts<"Modules">, Default<fcxx_modules.KeyPath>,
25982598
PosFlag<SetTrue, [CC1Option], "Enable the 'modules' language feature">,
25992599
NegFlag<SetFalse>, BothFlags<[NoXarchOption, CoreOption]>>;
2600-
def fbuiltin_headers_in_system_modules : Flag <["-"], "fbuiltin-headers-in-system-modules">,
2601-
Group<f_Group>,
2602-
Flags<[NoXarchOption,CC1Option]>,
2603-
ShouldParseIf<fmodules.KeyPath>,
2604-
HelpText<"builtin headers belong to system modules, and _Builtin_ modules are ignored for cstdlib headers">,
2605-
MarshallingInfoFlag<LangOpts<"BuiltinHeadersInSystemModules">>;
26062600
def fmodule_maps : Flag <["-"], "fmodule-maps">, Flags<[CoreOption]>, Alias<fimplicit_module_maps>;
26072601
def fmodule_name_EQ : Joined<["-"], "fmodule-name=">, Group<f_Group>,
26082602
Flags<[NoXarchOption,CC1Option,CoreOption]>, MetaVarName<"<name>">,

‎clang/include/clang/Lex/ModuleMap.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,7 @@ class ModuleMap {
427427
}
428428

429429
/// Is this a compiler builtin header?
430+
static bool isBuiltinHeader(StringRef FileName);
430431
bool isBuiltinHeader(const FileEntry *File);
431432

432433
/// Add a module map callback.

‎clang/lib/Driver/ToolChains/Darwin.cpp

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3023,25 +3023,6 @@ bool Darwin::isAlignedAllocationUnavailable() const {
30233023
return TargetVersion < alignedAllocMinVersion(OS);
30243024
}
30253025

3026-
static bool sdkSupportsBuiltinModules(const Darwin::DarwinPlatformKind &TargetPlatform, const std::optional<DarwinSDKInfo> &SDKInfo) {
3027-
if (!SDKInfo)
3028-
return false;
3029-
3030-
VersionTuple SDKVersion = SDKInfo->getVersion();
3031-
switch (TargetPlatform) {
3032-
case Darwin::MacOS:
3033-
return SDKVersion >= VersionTuple(99U);
3034-
case Darwin::IPhoneOS:
3035-
return SDKVersion >= VersionTuple(99U);
3036-
case Darwin::TvOS:
3037-
return SDKVersion >= VersionTuple(99U);
3038-
case Darwin::WatchOS:
3039-
return SDKVersion >= VersionTuple(99U);
3040-
default:
3041-
return true;
3042-
}
3043-
}
3044-
30453026
void Darwin::addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,
30463027
llvm::opt::ArgStringList &CC1Args,
30473028
Action::OffloadKind DeviceOffloadKind) const {
@@ -3064,20 +3045,6 @@ void Darwin::addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,
30643045
options::OPT_fvisibility_inlines_hidden_static_local_var,
30653046
options::OPT_fno_visibility_inlines_hidden_static_local_var))
30663047
CC1Args.push_back("-fvisibility-inlines-hidden-static-local-var");
3067-
3068-
// Earlier versions of the darwin SDK have the C standard library headers
3069-
// all together in the Darwin module. That leads to module cycles with
3070-
// the _Builtin_ modules. e.g. <inttypes.h> on darwin includes <stdint.h>.
3071-
// The builtin <stdint.h> include-nexts <stdint.h>. When both of those
3072-
// darwin headers are in the Darwin module, there's a module cycle Darwin ->
3073-
// _Builtin_stdint -> Darwin (i.e. inttypes.h (darwin) -> stdint.h (builtin) ->
3074-
// stdint.h (darwin)). This is fixed in later versions of the darwin SDK,
3075-
// but until then, the builtin headers need to join the system modules.
3076-
// i.e. when the builtin stdint.h is in the Darwin module too, the cycle
3077-
// goes away. Note that -fbuiltin-headers-in-system-modules does nothing
3078-
// to fix the same problem with C++ headers, and is generally fragile.
3079-
if (!sdkSupportsBuiltinModules(TargetPlatform, SDKInfo))
3080-
CC1Args.push_back("-fbuiltin-headers-in-system-modules");
30813048
}
30823049

30833050
void Darwin::addClangCC1ASTargetOptions(

‎clang/lib/Lex/ModuleMap.cpp

Lines changed: 23 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -253,45 +253,6 @@ OptionalFileEntryRef ModuleMap::findHeader(
253253
return NormalHdrFile;
254254
}
255255

256-
/// Determine whether the given file name is the name of a builtin
257-
/// header, supplied by Clang to replace, override, or augment existing system
258-
/// headers.
259-
static bool isBuiltinHeaderName(StringRef FileName) {
260-
return llvm::StringSwitch<bool>(FileName)
261-
.Case("float.h", true)
262-
.Case("iso646.h", true)
263-
.Case("limits.h", true)
264-
.Case("stdalign.h", true)
265-
.Case("stdarg.h", true)
266-
.Case("stdatomic.h", true)
267-
.Case("stdbool.h", true)
268-
.Case("stddef.h", true)
269-
.Case("stdint.h", true)
270-
.Case("tgmath.h", true)
271-
.Case("unwind.h", true)
272-
.Default(false);
273-
}
274-
275-
/// Determine whether the given module name is the name of a builtin
276-
/// module that is cyclic with a system module on some platforms.
277-
static bool isBuiltInModuleName(StringRef ModuleName) {
278-
return llvm::StringSwitch<bool>(ModuleName)
279-
.Case("_Builtin_float", true)
280-
.Case("_Builtin_inttypes", true)
281-
.Case("_Builtin_iso646", true)
282-
.Case("_Builtin_limits", true)
283-
.Case("_Builtin_stdalign", true)
284-
.Case("_Builtin_stdarg", true)
285-
.Case("_Builtin_stdatomic", true)
286-
.Case("_Builtin_stdbool", true)
287-
.Case("_Builtin_stddef", true)
288-
.Case("_Builtin_stdint", true)
289-
.Case("_Builtin_stdnoreturn", true)
290-
.Case("_Builtin_tgmath", true)
291-
.Case("_Builtin_unwind", true)
292-
.Default(false);
293-
}
294-
295256
void ModuleMap::resolveHeader(Module *Mod,
296257
const Module::UnresolvedHeaderDirective &Header,
297258
bool &NeedsFramework) {
@@ -336,7 +297,7 @@ bool ModuleMap::resolveAsBuiltinHeader(
336297
llvm::sys::path::is_absolute(Header.FileName) ||
337298
Mod->isPartOfFramework() || !Mod->IsSystem || Header.IsUmbrella ||
338299
!BuiltinIncludeDir || BuiltinIncludeDir == Mod->Directory ||
339-
!LangOpts.BuiltinHeadersInSystemModules || !isBuiltinHeaderName(Header.FileName))
300+
!isBuiltinHeader(Header.FileName))
340301
return false;
341302

342303
// This is a system module with a top-level header. This header
@@ -412,9 +373,28 @@ static StringRef sanitizeFilenameAsIdentifier(StringRef Name,
412373
return Name;
413374
}
414375

376+
/// Determine whether the given file name is the name of a builtin
377+
/// header, supplied by Clang to replace, override, or augment existing system
378+
/// headers.
379+
bool ModuleMap::isBuiltinHeader(StringRef FileName) {
380+
return llvm::StringSwitch<bool>(FileName)
381+
.Case("float.h", true)
382+
.Case("iso646.h", true)
383+
.Case("limits.h", true)
384+
.Case("stdalign.h", true)
385+
.Case("stdarg.h", true)
386+
.Case("stdatomic.h", true)
387+
.Case("stdbool.h", true)
388+
.Case("stddef.h", true)
389+
.Case("stdint.h", true)
390+
.Case("tgmath.h", true)
391+
.Case("unwind.h", true)
392+
.Default(false);
393+
}
394+
415395
bool ModuleMap::isBuiltinHeader(const FileEntry *File) {
416-
return File->getDir() == BuiltinIncludeDir && LangOpts.BuiltinHeadersInSystemModules &&
417-
isBuiltinHeaderName(llvm::sys::path::filename(File->getName()));
396+
return File->getDir() == BuiltinIncludeDir &&
397+
ModuleMap::isBuiltinHeader(llvm::sys::path::filename(File->getName()));
418398
}
419399

420400
ModuleMap::HeadersMap::iterator
@@ -2505,10 +2485,7 @@ void ModuleMapParser::parseHeaderDecl(MMToken::TokenKind LeadingToken,
25052485
}
25062486

25072487
bool NeedsFramework = false;
2508-
// Don't add the top level headers to the builtin modules if the builtin headers
2509-
// belong to the system modules.
2510-
if (!Map.LangOpts.BuiltinHeadersInSystemModules || ActiveModule->isSubModule() || !isBuiltInModuleName(ActiveModule->Name))
2511-
Map.addUnresolvedHeader(ActiveModule, std::move(Header), NeedsFramework);
2488+
Map.addUnresolvedHeader(ActiveModule, std::move(Header), NeedsFramework);
25122489

25132490
if (NeedsFramework)
25142491
Diags.Report(CurrModuleDeclLoc, diag::note_mmap_add_framework_keyword)

‎clang/test/Driver/Inputs/MacOSX99.0.sdk/SDKSettings.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎clang/test/Driver/darwin-builtin-modules.c

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎clang/test/Modules/Werror-Wsystem-headers.m

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,19 @@
33
// RUN: mkdir %t-saved
44

55
// Initial module build
6-
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fbuiltin-headers-in-system-modules \
7-
// RUN: -fmodules-cache-path=%t -fdisable-module-hash -isystem %S/Inputs/System/usr/include \
8-
// RUN: -fsyntax-only %s -verify
6+
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -fdisable-module-hash \
7+
// RUN: -isystem %S/Inputs/System/usr/include -fsyntax-only %s -verify
98
// RUN: cp %t/cstd.pcm %t-saved/cstd.pcm
109

1110
// Even with -Werror don't rebuild a system module
12-
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fbuiltin-headers-in-system-modules \
13-
// RUN: -fmodules-cache-path=%t -fdisable-module-hash -isystem %S/Inputs/System/usr/include \
14-
// RUN: -fsyntax-only %s -verify -Werror
11+
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -fdisable-module-hash \
12+
// RUN: -isystem %S/Inputs/System/usr/include -fsyntax-only %s -verify -Werror
1513
// RUN: diff %t/cstd.pcm %t-saved/cstd.pcm
1614

1715
// Unless -Wsystem-headers is on
18-
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fbuiltin-headers-in-system-modules \
19-
// RUN: -fmodules-cache-path=%t -fdisable-module-hash -isystem %S/Inputs/System/usr/include \
20-
// RUN: -fsyntax-only %s -verify -Werror=unused -Wsystem-headers
16+
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -fdisable-module-hash \
17+
// RUN: -isystem %S/Inputs/System/usr/include -fsyntax-only %s -verify \
18+
// RUN: -Werror=unused -Wsystem-headers
2119
// RUN: not diff %t/cstd.pcm %t-saved/cstd.pcm
2220

2321
// expected-no-diagnostics

‎clang/test/Modules/context-hash.c

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,22 @@
44
// RUN: rm -rf %t
55
// RUN: %clang_cc1 -fsyntax-only -internal-isystem \
66
// RUN: %S/Inputs/System/usr/include -fmodules -fimplicit-module-maps \
7-
// RUN: -fbuiltin-headers-in-system-modules -fmodules-cache-path=%t %s \
8-
// RUN: -Rmodule-build 2> %t1
7+
// RUN: -fmodules-cache-path=%t %s -Rmodule-build 2> %t1
98
// RUN: rm -rf %t
109
// RUN: %clang_cc1 -fsyntax-only -internal-isystem \
1110
// RUN: %S/Inputs/System/usr/include -internal-isystem %S -fmodules \
12-
// RUN: -fbuiltin-headers-in-system-modules -fimplicit-module-maps \
13-
// RUN: -fmodules-cache-path=%t %s -Rmodule-build 2> %t2
11+
// RUN: -fimplicit-module-maps -fmodules-cache-path=%t %s -Rmodule-build 2> \
12+
// RUN: %t2
1413
// RUN: rm -rf %t
1514
// RUN: %clang_cc1 -fsyntax-only -internal-isystem \
1615
// RUN: %S/Inputs/System/usr/include -internal-isystem %S -fmodules \
17-
// RUN: -fbuiltin-headers-in-system-modules -fimplicit-module-maps \
18-
// RUN: -fmodules-cache-path=%t %s -fmodules-strict-context-hash \
19-
// RUN: -Rmodule-build 2> %t3
16+
// RUN: -fimplicit-module-maps -fmodules-cache-path=%t %s \
17+
// RUN: -fmodules-strict-context-hash -Rmodule-build 2> %t3
2018
// RUN: rm -rf %t
2119
// RUN: %clang_cc1 -fsyntax-only -Weverything -internal-isystem \
2220
// RUN: %S/Inputs/System/usr/include -fmodules -fmodules-strict-context-hash \
23-
// RUN: -fbuiltin-headers-in-system-modules -fimplicit-module-maps \
24-
// RUN: -fmodules-cache-path=%t %s -Rmodule-build 2> %t4
21+
// RUN: -fimplicit-module-maps -fmodules-cache-path=%t %s -Rmodule-build 2> \
22+
// RUN: %t4
2523
// RUN: echo %t > %t.path
2624
// RUN: cat %t.path %t1 %t2 %t3 %t4 | FileCheck %s
2725

@@ -31,17 +29,16 @@
3129
// RUN: rm -rf %t
3230
// RUN: %clang_cc1 -fsyntax-only -internal-isystem \
3331
// RUN: %S/Inputs/System/usr/include -fmodules -fimplicit-module-maps \
34-
// RUN: -fbuiltin-headers-in-system-modules -fmodules-cache-path=%t \
35-
// RUN: -x objective-c %s -Rmodule-build 2> %t1
32+
// RUN: -fmodules-cache-path=%t -x objective-c %s -Rmodule-build 2> %t1
3633
// RUN: rm -rf %t
3734
// RUN: %clang_cc1 -fsyntax-only -internal-isystem \
3835
// RUN: %S/Inputs/System/usr/include -fmodules -fimplicit-module-maps \
39-
// RUN: -fbuiltin-headers-in-system-modules -fobjc-runtime=macosx-1.0.0.0 \
36+
// RUN: -fobjc-runtime=macosx-1.0.0.0 \
4037
// RUN: -fmodules-cache-path=%t -x objective-c %s -Rmodule-build 2> %t2
4138
// RUN: rm -rf %t
4239
// RUN: %clang_cc1 -fsyntax-only -internal-isystem \
4340
// RUN: %S/Inputs/System/usr/include -fmodules -fimplicit-module-maps \
44-
// RUN: -fbuiltin-headers-in-system-modules -fcomment-block-commands=lp,bj \
41+
// RUN: -fcomment-block-commands=lp,bj \
4542
// RUN: -fmodules-cache-path=%t -x objective-c %s -Rmodule-build 2> %t3
4643
// RUN: echo %t > %t.path
4744
// RUN: cat %t.path %t1 %t2 %t3 | FileCheck --check-prefix=LANGOPTS %s

‎clang/test/Modules/crash-vfs-include-pch.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
// RUN: %clang_cc1 -x objective-c-header -emit-pch %S/Inputs/pch-used.h \
77
// RUN: -o %t/out/pch-used.h.pch -fmodules -fimplicit-module-maps \
8-
// RUN: -fbuiltin-headers-in-system-modules -fmodules-cache-path=%t/cache -O0 \
8+
// RUN: -fmodules-cache-path=%t/cache -O0 \
99
// RUN: -isystem %S/Inputs/System/usr/include
1010

1111
// RUN: env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%t TEMP=%t TMP=%t \
1212
// RUN: not %clang %s -E -include-pch %t/out/pch-used.h.pch -fmodules -nostdlibinc \
13-
// RUN: -fimplicit-module-maps -fbuiltin-headers-in-system-modules \
14-
// RUN: -fmodules-cache-path=%t/cache -O0 -Xclang -fno-validate-pch \
15-
// RUN: -isystem %S/Inputs/System/usr/include -o %t/output.E 2>&1 | FileCheck %s
13+
// RUN: -fimplicit-module-maps -fmodules-cache-path=%t/cache -O0 \
14+
// RUN: -Xclang -fno-validate-pch -isystem %S/Inputs/System/usr/include \
15+
// RUN: -o %t/output.E 2>&1 | FileCheck %s
1616

1717
// RUN: FileCheck --check-prefix=CHECKSH %s -input-file %t/crash-vfs-*.sh
1818
// RUN: FileCheck --check-prefix=CHECKYAML %s -input-file \

‎clang/test/Modules/cstd.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: rm -rf %t
2-
// RUN: %clang_cc1 -fsyntax-only -internal-isystem %S/Inputs/System/usr/include -fmodules -fimplicit-module-maps -fbuiltin-headers-in-system-modules -fmodules-cache-path=%t -D__need_wint_t -Werror=implicit-function-declaration %s
2+
// RUN: %clang_cc1 -fsyntax-only -internal-isystem %S/Inputs/System/usr/include -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -D__need_wint_t -Werror=implicit-function-declaration %s
33

44
@import uses_other_constants;
55
const double other_value = DBL_MAX;

‎clang/test/Modules/pch-used.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// UNSUPPORTED: target={{.*}}-zos{{.*}}, target={{.*}}-aix{{.*}}
22
// RUN: rm -rf %t
33
// RUN: mkdir %t
4-
// RUN: %clang_cc1 -x objective-c-header -emit-pch %S/Inputs/pch-used.h -o %t/pch-used.h.pch -fmodules -fimplicit-module-maps -fbuiltin-headers-in-system-modules -fmodules-cache-path=%t/cache -O0 -isystem %S/Inputs/System/usr/include
5-
// RUN: %clang_cc1 %s -include-pch %t/pch-used.h.pch -fmodules -fimplicit-module-maps -fbuiltin-headers-in-system-modules -fmodules-cache-path=%t/cache -O0 -isystem %S/Inputs/System/usr/include -emit-llvm -o - | FileCheck %s
4+
// RUN: %clang_cc1 -x objective-c-header -emit-pch %S/Inputs/pch-used.h -o %t/pch-used.h.pch -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -O0 -isystem %S/Inputs/System/usr/include
5+
// RUN: %clang_cc1 %s -include-pch %t/pch-used.h.pch -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -O0 -isystem %S/Inputs/System/usr/include -emit-llvm -o - | FileCheck %s
66

77
void f(void) { SPXTrace(); }
88
void g(void) { double x = DBL_MAX; }

‎clang/test/Modules/shadowed-submodule.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: rm -rf %t
2-
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fbuiltin-headers-in-system-modules -fmodules-cache-path=%t -I %S/Inputs/shadowed-submodule/Foo -I %S/Inputs/shadowed-submodule/A2 %s -verify
2+
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -I %S/Inputs/shadowed-submodule/Foo -I %S/Inputs/shadowed-submodule/A2 %s -verify
33

44
@import Foo; // expected-error {{module 'A' was built in directory}}
55
// [email protected]:4 {{imported by module 'Foo'}}

‎clang/test/Modules/stddef.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: rm -rf %t
2-
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fbuiltin-headers-in-system-modules -fmodules-cache-path=%t -I%S/Inputs/StdDef %s -verify -fno-modules-error-recovery
2+
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -I%S/Inputs/StdDef %s -verify -fno-modules-error-recovery
33

44
#include "ptrdiff_t.h"
55

‎clang/test/Modules/stddef.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
size_t getSize(void);
44

55
// RUN: rm -rf %t
6-
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fbuiltin-headers-in-system-modules -fmodules-cache-path=%t -I %S/Inputs/StdDef %s -verify
6+
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -I %S/Inputs/StdDef %s -verify
77
// expected-no-diagnostics

‎lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,6 @@ ClangExpressionParser::ClangExpressionParser(
576576
lang_opts.GNUMode = true;
577577
lang_opts.GNUKeywords = true;
578578
lang_opts.CPlusPlus11 = true;
579-
lang_opts.BuiltinHeadersInSystemModules = true;
580579

581580
// The Darwin libc expects this macro to be set.
582581
lang_opts.GNUCVersion = 40201;

0 commit comments

Comments
 (0)