Skip to content

[cxx-interop] Import complex macros consistently in C++ language mode #84260

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
Sep 12, 2025
Merged

[cxx-interop] Import complex macros consistently in C++ language mode #84260

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
12 changes: 8 additions & 4 deletions lib/ClangImporter/ImportMacro.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,12 +333,16 @@ getIntegerConstantForMacroToken(ClangImporter::Implementation &impl,
}

// Macro identifier.
// TODO: for some reason when in C++ mode, "hasMacroDefinition" is often
// false: rdar://110071334
} else if (token.is(clang::tok::identifier) &&
token.getIdentifierInfo()->hasMacroDefinition()) {
} else if (token.is(clang::tok::identifier)) {

auto rawID = token.getIdentifierInfo();

// When importing in (Objective-)C++ language mode, sometimes a macro might
// have an outdated identifier info, which would cause Clang preprocessor to
// assume that it does not have a definition.
if (rawID->isOutOfDate())
(void)impl.getClangPreprocessor().getLeafModuleMacros(rawID);

auto definition = impl.getClangPreprocessor().getMacroDefinition(rawID);
if (!definition)
return std::nullopt;
Expand Down
4 changes: 1 addition & 3 deletions test/ClangImporter/macros.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -typecheck -verify %s

// Most of these don't pass: rdar://110071334
// %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-experimental-cxx-interop -enable-objc-interop -typecheck -verify %s
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -cxx-interoperability-mode=default -enable-objc-interop -typecheck -verify %s

@_exported import macros

Expand Down
7 changes: 7 additions & 0 deletions test/Interop/Cxx/objc-correctness/darwin-macros.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// RUN: %target-swift-frontend -cxx-interoperability-mode=default -typecheck -verify -I %S/Inputs %s

// REQUIRES: OS=macosx

import Darwin

let _ = COPYFILE_ALL