Skip to content

[cxx-interop] Emit #endif // defined(__OBJC__) with the comment consistently #85439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 13, 2025
+7 −7
Merged

[cxx-interop] Emit #endif // defined(__OBJC__) with the comment consistently #85439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/PrintAsClang/DeclAndTypePrinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1574,7 +1574,7 @@ class DeclAndTypePrinter::Implementation
}
os << "\n";
if (representation.isObjCxxOnly())
os << "#endif\n";
os << "#endif // defined(__OBJC__)\n";
return representation;
}

Expand Down Expand Up @@ -1684,7 +1684,7 @@ class DeclAndTypePrinter::Implementation
FD->getParameters(), funcTy->isThrowing(), funcTy);
os << "}\n";
if (result.isObjCxxOnly())
os << "#endif\n";
os << "#endif // defined(__OBJC__)\n";
}

enum class PrintLeadingSpace : bool {
Expand Down
2 changes: 1 addition & 1 deletion lib/PrintAsClang/PrintAsClang.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ static void emitObjCConditional(raw_ostream &out,
out << "#else\n";
nonObjCCase();
}
out << "#endif\n";
out << "#endif // defined(__OBJC__)\n";
}

static void emitExternC(raw_ostream &out,
Expand Down
4 changes: 2 additions & 2 deletions lib/PrintAsClang/PrintClangFunction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,7 +1686,7 @@ void DeclAndTypeClangFunctionPrinter::printCxxMethod(
if (!isDefinition) {
os << ";\n";
if (result.isObjCxxOnly())
os << "#endif\n";
os << "#endif // defined(__OBJC__)\n";
return;
}

Expand All @@ -1699,7 +1699,7 @@ void DeclAndTypeClangFunctionPrinter::printCxxMethod(
dispatchInfo);
os << " }\n";
if (result.isObjCxxOnly())
os << "#endif\n";
os << "#endif // defined(__OBJC__)\n";
}

/// Returns true if the given property name like `isEmpty` can be remapped
Expand Down
2 changes: 1 addition & 1 deletion lib/PrintAsClang/PrintClangValueType.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ void ClangValueTypePrinter::printTypeGenericTraits(
os << "} // namespace\n";
os << "#pragma clang diagnostic pop\n";
if (objCxxOnly)
os << "#endif // #if defined(__OBJC__)\n";
os << "#endif // defined(__OBJC__)\n";
os << "} // namespace swift\n";
os << "\n";
printer.printModuleNamespaceStart(*moduleContext);
Expand Down
2 changes: 1 addition & 1 deletion test/PrintAsObjC/Inputs/comments-expected-output.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ SWIFT_CLASS("_TtC8comments13UnorderedList")
- (void)f0;
@end

#endif
#endif // defined(__OBJC__)
#if __has_attribute(external_source_symbol)
# pragma clang attribute pop
#endif
Expand Down