Skip to content

Commit 994c6d1

Browse files
committed
ClangImporter: minor clang-format fixing (NFC)
1 parent a59af98 commit 994c6d1

File tree

1 file changed

+18
-22
lines changed

1 file changed

+18
-22
lines changed

lib/ClangImporter/ClangImporter.cpp

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -435,37 +435,33 @@ getNormalInvocationArguments(std::vector<std::string> &invocationArgStrs,
435435

436436
auto languageVersion = ctx.LangOpts.EffectiveLanguageVersion;
437437

438-
if (llvm::sys::path::extension(importerOpts.BridgingHeader).endswith(
439-
PCH_EXTENSION)) {
440-
invocationArgStrs.insert(
441-
invocationArgStrs.end(),
442-
{ "-include-pch", importerOpts.BridgingHeader }
443-
);
438+
if (llvm::sys::path::extension(importerOpts.BridgingHeader)
439+
.endswith(PCH_EXTENSION)) {
440+
invocationArgStrs.insert(invocationArgStrs.end(), {
441+
"-include-pch", importerOpts.BridgingHeader
442+
});
444443
}
445444

446445
// Construct the invocation arguments for the current target.
447446
// Add target-independent options first.
448-
invocationArgStrs.insert(
449-
invocationArgStrs.end(),
450-
{
451-
452-
// Enable modules
453-
"-fmodules",
454-
"-Werror=non-modular-include-in-framework-module",
455-
"-Xclang", "-fmodule-feature", "-Xclang", "swift",
447+
invocationArgStrs.insert(invocationArgStrs.end(), {
448+
// Enable modules
449+
"-fmodules",
450+
"-Werror=non-modular-include-in-framework-module",
451+
"-Xclang", "-fmodule-feature", "-Xclang", "swift",
456452

457-
// Don't emit LLVM IR.
458-
"-fsyntax-only",
453+
// Don't emit LLVM IR.
454+
"-fsyntax-only",
459455

460-
// Enable block support.
461-
"-fblocks",
456+
// Enable block support.
457+
"-fblocks",
462458

463-
languageVersion.preprocessorDefinition("__swift__", {10000, 100, 1}),
459+
languageVersion.preprocessorDefinition("__swift__", {10000, 100, 1}),
464460

465-
"-fretain-comments-from-system-headers",
461+
"-fretain-comments-from-system-headers",
466462

467-
SHIMS_INCLUDE_FLAG, searchPathOpts.RuntimeResourcePath,
468-
});
463+
SHIMS_INCLUDE_FLAG, searchPathOpts.RuntimeResourcePath,
464+
});
469465

470466
// Set C language options.
471467
if (triple.isOSDarwin()) {

0 commit comments

Comments
 (0)