averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[interop][SwiftToCxx] include _SwiftCxxInteroperability.h in the toolchain, relative to clang's resource dir

Browse Source
This commit is contained in:
Alex Lorenz
2022-08-03 17:24:39 +01:00
parent 09dcbdecb1
commit aab5c45c01
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/PrintAsClang/PrintAsClang.cpp
View File

@@ -105,7 +105,13 @@ static void writePrologue(raw_ostream &out, ASTContext &ctx,
"#include <cstring>\n"; "#include <cstring>\n";
out << "#include <stdlib.h>\n"; out << "#include <stdlib.h>\n";
out << "#include <new>\n"; out << "#include <new>\n";
out << "#if __has_include(<shims/_SwiftCxxInteroperability.h>)\n"; // FIXME: Look for the header in the SDK.
out << "// Look for the C++ interop support header relative to clang's resource dir:\n";
out << "// '<toolchain>/usr/lib/clang/<version>/include/../../../swift/shims'.\n";
out << "#if __has_include(<../../../swift/shims/_SwiftCxxInteroperability.h>)\n";
out << "#include <../../../swift/shims/_SwiftCxxInteroperability.h>\n";
out << "// Alternatively, allow user to find the header using additional include path into 'swift'.\n";
out << "#elif __has_include(<shims/_SwiftCxxInteroperability.h>)\n";
out << "#include <shims/_SwiftCxxInteroperability.h>\n"; out << "#include <shims/_SwiftCxxInteroperability.h>\n";
out << "#endif\n"; out << "#endif\n";
}, },

7
test/PrintAsCxx/empty.swift
View File

@@ -31,7 +31,12 @@
// CHECK-NEXT: #include <cstring> // CHECK-NEXT: #include <cstring>
// CHECK-NEXT: #include <stdlib.h> // CHECK-NEXT: #include <stdlib.h>
// CHECK-NEXT: #include <new> // CHECK-NEXT: #include <new>
// CHECK-NEXT: #if __has_include(<shims/_SwiftCxxInteroperability.h>) // CHECK-NEXT: // Look for the C++ interop support header relative to clang's resource dir:
// CHECK-NEXT: // '<toolchain>/usr/lib/clang/<version>/include/../../../swift/shims'.
// CHECK-NEXT: #if __has_include(<../../../swift/shims/_SwiftCxxInteroperability.h>)
// CHECK-NEXT: #include <../../../swift/shims/_SwiftCxxInteroperability.h>
// CHECK-NEXT: // Alternatively, allow user to find the header using additional include path into 'swift'.
// CHECK-NEXT: #elif __has_include(<shims/_SwiftCxxInteroperability.h>)
// CHECK-NEXT: #include <shims/_SwiftCxxInteroperability.h> // CHECK-NEXT: #include <shims/_SwiftCxxInteroperability.h>
// CHECK-NEXT: #endif // CHECK-NEXT: #endif
// CHECK-NEXT: #else // CHECK-NEXT: #else