add a module map for swift/bridging header

Author: hyp

lib/ClangImporter/CMakeLists.txt

@@ -57,7 +57,9 @@ add_custom_target("copy_cxxInterop_support_header"
     DEPENDS "${SWIFTINC_DIR}/bridging"
     COMMENT "Copying C++ interop support header to ${SWIFTINC_DIR}")
 
-swift_install_in_component(FILES "${CMAKE_CURRENT_SOURCE_DIR}/bridging"
+swift_install_in_component(FILES
+                           "${CMAKE_CURRENT_SOURCE_DIR}/bridging"
+                           "${CMAKE_CURRENT_SOURCE_DIR}/module.modulemap"
                            DESTINATION "include/swift"
                            COMPONENT compiler)
 

lib/ClangImporter/module.modulemap

@@ -0,0 +1,17 @@
+//===------------------ module.modulemap - C++ and Swift module -*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+module SwiftBridging {
+    header "bridging"
+
+    export *
+}

test/Interop/Cxx/ergonomics/swift-bridging-annotations.swift

@@ -5,6 +5,8 @@
 
 // RUN: %target-swift-ide-test -print-module -module-to-print=SwiftMod -module-to-print=CxxModule -I %t -I %t/Inputs -I %swift_src_root/lib/ClangImporter -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
 
+// RUN: %target-swift-ide-test -print-module -module-to-print=SwiftMod -module-to-print=CxxModule -I %t -I %t/Inputs -I %swift_src_root/lib/ClangImporter -source-filename=x -enable-experimental-cxx-interop -Xcc -DINCMOD | %FileCheck %s
+
 //--- SwiftMod.swift
 
 public protocol Proto {
@@ -21,7 +23,11 @@ module CxxModule {
 // Note: in actuality, this will be included
 // as <swift/bridging>, but in this test we include
 // it directly.
+#ifndef INCMOD
 #include "bridging"
+#else
+#pragma clang module import SwiftBridging
+#endif
 
 class SELF_CONTAINED SelfContained {
 public: