Merge pull request #61384 from hyp/fix-local-path

[interop][SwiftToCxx] fix the include path for swiftToCxx shim header…

Author: hyp

lib/PrintAsClang/ClangSyntaxPrinter.cpp

@@ -342,12 +342,12 @@ void ClangSyntaxPrinter::printIncludeForShimHeader(StringRef headerName) {
         "swiftToCxx'.\n";
   os << "#if __has_include(<../../../swift/swiftToCxx/" << headerName << ">)\n";
   os << "#include <../../../swift/swiftToCxx/" << headerName << ">\n";
-  os << "#elif __has_include(<../../../../lib/swift/swiftToCxx/" << headerName
-     << ">)\n";
+  os << "#elif __has_include(<../../../../../lib/swift/swiftToCxx/"
+     << headerName << ">)\n";
   os << "//  "
-        "'<toolchain>/usr/local/lib/clang/<version>/include/../../../../lib/"
+        "'<toolchain>/usr/local/lib/clang/<version>/include/../../../../../lib/"
         "swift/swiftToCxx'.\n";
-  os << "#include <../../../../lib/swift/swiftToCxx/" << headerName << ">\n";
+  os << "#include <../../../../../lib/swift/swiftToCxx/" << headerName << ">\n";
   os << "// Alternatively, allow user to find the header using additional "
         "include path into '<toolchain>/lib/swift'.\n";
   os << "#elif __has_include(<swiftToCxx/" << headerName << ">)\n";

lib/PrintAsClang/experimental-interoperability-version.json

@@ -1 +1 @@
-1
+2

test/Interop/SwiftToCxx/stdlib/swift-stdlib-in-cxx.swift

@@ -71,9 +71,9 @@
 
 // CHECK: #if __has_include(<../../../swift/swiftToCxx/_SwiftStdlibCxxOverlay.h>)
 // CHECK-NEXT: #include <../../../swift/swiftToCxx/_SwiftStdlibCxxOverlay.h>
-// CHECK-NEXT: #elif __has_include(<../../../../lib/swift/swiftToCxx/_SwiftStdlibCxxOverlay.h>)
-// CHECK-NEXT: //  '<toolchain>/usr/local/lib/clang/<version>/include/../../../../lib/swift/swiftToCxx'.
-// CHECK-NEXT: #include <../../../../lib/swift/swiftToCxx/_SwiftStdlibCxxOverlay.h>
+// CHECK-NEXT: #elif __has_include(<../../../../../lib/swift/swiftToCxx/_SwiftStdlibCxxOverlay.h>)
+// CHECK-NEXT: //  '<toolchain>/usr/local/lib/clang/<version>/include/../../../../../lib/swift/swiftToCxx'.
+// CHECK-NEXT: #include <../../../../../lib/swift/swiftToCxx/_SwiftStdlibCxxOverlay.h>
 // CHECK-NEXT: // Alternatively, allow user to find the header using additional include path into '<toolchain>/lib/swift'.
 // CHECK-NEXT: #elif __has_include(<swiftToCxx/_SwiftStdlibCxxOverlay.h>)
 // CHECK-NEXT: #include <swiftToCxx/_SwiftStdlibCxxOverlay.h>

test/PrintAsCxx/empty.swift

@@ -36,9 +36,9 @@
 // CHECK-NEXT:  //  '<toolchain>/usr/lib/clang/<version>/include/../../../swift/swiftToCxx'.
 // CHECK-NEXT:  #if __has_include(<../../../swift/swiftToCxx/_SwiftCxxInteroperability.h>)
 // CHECK-NEXT:  #include <../../../swift/swiftToCxx/_SwiftCxxInteroperability.h>
-// CHECK-NEXT:  #elif __has_include(<../../../../lib/swift/swiftToCxx/_SwiftCxxInteroperability.h>)
-// CHECK-NEXT:  //  '<toolchain>/usr/local/lib/clang/<version>/include/../../../../lib/swift/swiftToCxx'.
-// CHECK-NEXT:  #include <../../../../lib/swift/swiftToCxx/_SwiftCxxInteroperability.h>
+// CHECK-NEXT:  #elif __has_include(<../../../../../lib/swift/swiftToCxx/_SwiftCxxInteroperability.h>)
+// CHECK-NEXT:  //  '<toolchain>/usr/local/lib/clang/<version>/include/../../../../../lib/swift/swiftToCxx'.
+// CHECK-NEXT:  #include <../../../../../lib/swift/swiftToCxx/_SwiftCxxInteroperability.h>
 // CHECK-NEXT:  // Alternatively, allow user to find the header using additional include path into '<toolchain>/lib/swift'.
 // CHECK-NEXT:  #elif __has_include(<swiftToCxx/_SwiftCxxInteroperability.h>)
 // CHECK-NEXT:  #include <swiftToCxx/_SwiftCxxInteroperability.h>