Skip to content

🍒[cxx-interop] Make libstdc++ header and modulemap arch-independent #66878

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

Closed
wants to merge 1 commit into from
Closed

🍒[cxx-interop] Make libstdc++ header and modulemap arch-independent #66878

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
2 changes: 1 addition & 1 deletion lib/ClangImporter/ClangIncludePaths.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ static Optional<Path> getLibStdCxxModuleMapPath(
SearchPathOptions &opts, const llvm::Triple &triple,
const llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> &vfs) {
return getActualModuleMapPath("libstdcxx.modulemap", opts, triple,
/*isArchSpecific*/ true, vfs);
/*isArchSpecific*/ false, vfs);
}

Optional<SmallString<128>>
Expand Down
185 changes: 90 additions & 95 deletions stdlib/public/Cxx/libstdcxx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,120 +4,115 @@ foreach(sdk ${SWIFT_SDKS})
continue()
endif()

foreach(arch ${SWIFT_SDK_${sdk}_ARCHITECTURES})
set(arch_suffix "${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
set(arch_subdir "${SWIFT_SDK_${sdk}_LIB_SUBDIR}/${arch}")
set(module_dir "${SWIFTLIB_DIR}/${SWIFT_SDK_${sdk}_LIB_SUBDIR}")
set(module_dir_static "${SWIFTSTATICLIB_DIR}/${SWIFT_SDK_${sdk}_LIB_SUBDIR}")

set(module_dir "${SWIFTLIB_DIR}/${arch_subdir}")
set(module_dir_static "${SWIFTSTATICLIB_DIR}/${arch_subdir}")
set(libstdcxx_header "libstdcxx.h")
set(libstdcxx_header_out "${module_dir}/libstdcxx.h")
set(libstdcxx_header_out_static "${module_dir_static}/libstdcxx.h")
set(libstdcxx_modulemap "libstdcxx.modulemap")
set(libstdcxx_modulemap_out "${module_dir}/libstdcxx.modulemap")
set(libstdcxx_modulemap_out_static "${module_dir_static}/libstdcxx.modulemap")

set(libstdcxx_header "libstdcxx.h")
set(libstdcxx_header_out "${module_dir}/libstdcxx.h")
set(libstdcxx_header_out_static "${module_dir_static}/libstdcxx.h")
set(libstdcxx_modulemap "libstdcxx.modulemap")
set(libstdcxx_modulemap_out "${module_dir}/libstdcxx.modulemap")
set(libstdcxx_modulemap_out_static "${module_dir_static}/libstdcxx.modulemap")
add_custom_command_target(
copy_libstdcxx_modulemap
COMMAND
"${CMAKE_COMMAND}" "-E" "make_directory" ${module_dir}
COMMAND
"${CMAKE_COMMAND}" "-E" "copy_if_different" "${CMAKE_CURRENT_SOURCE_DIR}/${libstdcxx_modulemap}" "${libstdcxx_modulemap_out}"
OUTPUT ${libstdcxx_modulemap_out}
DEPENDS ${libstdcxx_modulemap}
COMMENT "Copying libstdcxx modulemap to resources")
list(APPEND libstdcxx_modulemap_target_list ${copy_libstdcxx_modulemap})
add_dependencies(swift-stdlib-${SWIFT_SDK_${sdk}_LIB_SUBDIR} ${copy_libstdcxx_modulemap})

add_custom_command_target(
copy_libstdcxx_header
COMMAND
"${CMAKE_COMMAND}" "-E" "make_directory" ${module_dir}
COMMAND
"${CMAKE_COMMAND}" "-E" "copy_if_different" "${CMAKE_CURRENT_SOURCE_DIR}/${libstdcxx_header}" "${libstdcxx_header_out}"
OUTPUT ${libstdcxx_header_out}
DEPENDS ${libstdcxx_header}
COMMENT "Copying libstdcxx header to resources")
list(APPEND libstdcxx_modulemap_target_list ${copy_libstdcxx_header})
add_dependencies(swift-stdlib-${SWIFT_SDK_${sdk}_LIB_SUBDIR} ${copy_libstdcxx_header})

if(SWIFT_BUILD_STATIC_STDLIB)
add_custom_command_target(
copy_libstdcxx_modulemap
copy_libstdcxx_modulemap_static
COMMAND
"${CMAKE_COMMAND}" "-E" "make_directory" ${module_dir}
"${CMAKE_COMMAND}" "-E" "make_directory" ${module_dir_static}
COMMAND
"${CMAKE_COMMAND}" "-E" "copy_if_different" "${CMAKE_CURRENT_SOURCE_DIR}/${libstdcxx_modulemap}" "${libstdcxx_modulemap_out}"
OUTPUT ${libstdcxx_modulemap_out}
DEPENDS ${libstdcxx_modulemap}
COMMENT "Copying libstdcxx modulemap to resources")
list(APPEND libstdcxx_modulemap_target_list ${copy_libstdcxx_modulemap})
add_dependencies(swift-stdlib-${arch_suffix} ${copy_libstdcxx_modulemap})
"${CMAKE_COMMAND}" "-E" "copy_if_different"
"${libstdcxx_modulemap_out}" "${libstdcxx_modulemap_out_static}"
OUTPUT ${libstdcxx_modulemap_out_static}
DEPENDS ${copy_libstdcxx_modulemap}
COMMENT "Copying libstdcxx modulemap to static resources")
list(APPEND libstdcxx_modulemap_target_list ${copy_libstdcxx_modulemap_static})
add_dependencies(swift-stdlib-${SWIFT_SDK_${sdk}_LIB_SUBDIR} ${copy_libstdcxx_modulemap_static})

add_custom_command_target(
copy_libstdcxx_header
copy_libstdcxx_header_static
COMMAND
"${CMAKE_COMMAND}" "-E" "make_directory" ${module_dir}
"${CMAKE_COMMAND}" "-E" "make_directory" ${module_dir_static}
COMMAND
"${CMAKE_COMMAND}" "-E" "copy_if_different" "${CMAKE_CURRENT_SOURCE_DIR}/${libstdcxx_header}" "${libstdcxx_header_out}"
OUTPUT ${libstdcxx_header_out}
DEPENDS ${libstdcxx_header}
COMMENT "Copying libstdcxx header to resources")
list(APPEND libstdcxx_modulemap_target_list ${copy_libstdcxx_header})
add_dependencies(swift-stdlib-${arch_suffix} ${copy_libstdcxx_header})

if(SWIFT_BUILD_STATIC_STDLIB)
add_custom_command_target(
copy_libstdcxx_modulemap_static
COMMAND
"${CMAKE_COMMAND}" "-E" "make_directory" ${module_dir_static}
COMMAND
"${CMAKE_COMMAND}" "-E" "copy_if_different"
"${libstdcxx_modulemap_out}" "${libstdcxx_modulemap_out_static}"
OUTPUT ${libstdcxx_modulemap_out_static}
DEPENDS ${copy_libstdcxx_modulemap}
COMMENT "Copying libstdcxx modulemap to static resources")
list(APPEND libstdcxx_modulemap_target_list ${copy_libstdcxx_modulemap_static})
add_dependencies(swift-stdlib-${arch_suffix} ${copy_libstdcxx_modulemap_static})
"${CMAKE_COMMAND}" "-E" "copy_if_different"
"${libstdcxx_header_out}" "${libstdcxx_header_out_static}"
OUTPUT ${libstdcxx_header_out_static}
DEPENDS ${copy_libstdcxx_header}
COMMENT "Copying libstdcxx header to static resources")
list(APPEND libstdcxx_modulemap_target_list ${copy_libstdcxx_header_static})
add_dependencies(swift-stdlib-${SWIFT_SDK_${sdk}_LIB_SUBDIR} ${copy_libstdcxx_header_static})
endif()

add_custom_command_target(
copy_libstdcxx_header_static
COMMAND
"${CMAKE_COMMAND}" "-E" "make_directory" ${module_dir_static}
COMMAND
"${CMAKE_COMMAND}" "-E" "copy_if_different"
"${libstdcxx_header_out}" "${libstdcxx_header_out_static}"
OUTPUT ${libstdcxx_header_out_static}
DEPENDS ${copy_libstdcxx_header}
COMMENT "Copying libstdcxx header to static resources")
list(APPEND libstdcxx_modulemap_target_list ${copy_libstdcxx_header_static})
add_dependencies(swift-stdlib-${arch_suffix} ${copy_libstdcxx_header_static})
endif()
swift_install_in_component(FILES "${libstdcxx_modulemap_out}"
DESTINATION "lib/swift/${SWIFT_SDK_${sdk}_LIB_SUBDIR}"
COMPONENT sdk-overlay)
swift_install_in_component(FILES "${libstdcxx_header_out}"
DESTINATION "lib/swift/${SWIFT_SDK_${sdk}_LIB_SUBDIR}"
COMPONENT sdk-overlay)

swift_install_in_component(FILES "${libstdcxx_modulemap_out}"
DESTINATION "lib/swift/${arch_subdir}"
if(SWIFT_BUILD_STATIC_STDLIB)
swift_install_in_component(FILES "${libstdcxx_modulemap_out_static}"
DESTINATION "lib/swift_static/${SWIFT_SDK_${sdk}_LIB_SUBDIR}"
COMPONENT sdk-overlay)
swift_install_in_component(FILES "${libstdcxx_header_out}"
DESTINATION "lib/swift/${arch_subdir}"
swift_install_in_component(FILES "${libstdcxx_header_out_static}"
DESTINATION "lib/swift_static/${SWIFT_SDK_${sdk}_LIB_SUBDIR}"
COMPONENT sdk-overlay)
endif()

if(SWIFT_BUILD_STATIC_STDLIB)
swift_install_in_component(FILES "${libstdcxx_modulemap_out_static}"
DESTINATION "lib/swift_static/${arch_subdir}"
COMPONENT sdk-overlay)
swift_install_in_component(FILES "${libstdcxx_header_out_static}"
DESTINATION "lib/swift_static/${arch_subdir}"
COMPONENT sdk-overlay)
endif()

if(${BOOTSTRAPPING_MODE} MATCHES "BOOTSTRAPPING.*")
foreach(bootstrapping "0" "1")
get_bootstrapping_path(bootstrapping_dir ${module_dir} ${bootstrapping})
set(libstdcxx_modulemap_out_bootstrapping "${bootstrapping_dir}/libstdcxx.modulemap")
set(libstdcxx_header_out_bootstrapping "${bootstrapping_dir}/libstdcxx.h")
if(${BOOTSTRAPPING_MODE} MATCHES "BOOTSTRAPPING.*")
foreach(bootstrapping "0" "1")
get_bootstrapping_path(bootstrapping_dir ${module_dir} ${bootstrapping})
set(libstdcxx_modulemap_out_bootstrapping "${bootstrapping_dir}/libstdcxx.modulemap")
set(libstdcxx_header_out_bootstrapping "${bootstrapping_dir}/libstdcxx.h")

add_custom_command_target(unused_var
COMMAND
"${CMAKE_COMMAND}" "-E" "make_directory" "${bootstrapping_dir}"
COMMAND
"${CMAKE_COMMAND}" "-E" "copy_if_different"
"${CMAKE_CURRENT_SOURCE_DIR}/${libstdcxx_modulemap}" "${libstdcxx_modulemap_out_bootstrapping}"
add_custom_command_target(unused_var
COMMAND
"${CMAKE_COMMAND}" "-E" "make_directory" "${bootstrapping_dir}"
COMMAND
"${CMAKE_COMMAND}" "-E" "copy_if_different"
"${CMAKE_CURRENT_SOURCE_DIR}/${libstdcxx_modulemap}" "${libstdcxx_modulemap_out_bootstrapping}"

CUSTOM_TARGET_NAME "copy-libstdcxx-modulemap-bootstrapping${bootstrapping}"
OUTPUT "${libstdcxx_modulemap_out_bootstrapping}"
DEPENDS ${libstdcxx_modulemap}
COMMENT "Copying libstdcxx modulemap to resources for bootstrapping${bootstrapping}")
CUSTOM_TARGET_NAME "copy-libstdcxx-modulemap-bootstrapping${bootstrapping}"
OUTPUT "${libstdcxx_modulemap_out_bootstrapping}"
DEPENDS ${libstdcxx_modulemap}
COMMENT "Copying libstdcxx modulemap to resources for bootstrapping${bootstrapping}")

add_custom_command_target(unused_var
COMMAND
"${CMAKE_COMMAND}" "-E" "make_directory" "${bootstrapping_dir}"
COMMAND
"${CMAKE_COMMAND}" "-E" "copy_if_different"
"${CMAKE_CURRENT_SOURCE_DIR}/${libstdcxx_header}" "${libstdcxx_header_out_bootstrapping}"
add_custom_command_target(unused_var
COMMAND
"${CMAKE_COMMAND}" "-E" "make_directory" "${bootstrapping_dir}"
COMMAND
"${CMAKE_COMMAND}" "-E" "copy_if_different"
"${CMAKE_CURRENT_SOURCE_DIR}/${libstdcxx_header}" "${libstdcxx_header_out_bootstrapping}"

CUSTOM_TARGET_NAME "copy-libstdcxx-header-bootstrapping${bootstrapping}"
OUTPUT "${libstdcxx_header_out_bootstrapping}"
DEPENDS ${libstdcxx_header}
COMMENT "Copying libstdcxx header to resources for bootstrapping${bootstrapping}")
endforeach()
endif()
endforeach()
CUSTOM_TARGET_NAME "copy-libstdcxx-header-bootstrapping${bootstrapping}"
OUTPUT "${libstdcxx_header_out_bootstrapping}"
DEPENDS ${libstdcxx_header}
COMMENT "Copying libstdcxx header to resources for bootstrapping${bootstrapping}")
endforeach()
endif()
endforeach()
add_custom_target(libstdcxx-modulemap DEPENDS ${libstdcxx_modulemap_target_list})
set_property(TARGET libstdcxx-modulemap PROPERTY FOLDER "Miscellaneous")
Expand Down
11 changes: 5 additions & 6 deletions unittests/ClangImporter/ClangImporterTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,7 @@ struct LibStdCxxInjectionVFS {

// Add a libstdc++ modulemap that's part of Swift's distribution.
LibStdCxxInjectionVFS &libstdCxxModulemap(StringRef contents = "") {
newFile("/usr/lib/swift/" + osString + "/" + archString +
"/libstdcxx.modulemap",
newFile("/usr/lib/swift/" + osString + "/libstdcxx.modulemap",
contents.empty() ? getLibstdcxxModulemapContents() : contents);
return *this;
}
Expand Down Expand Up @@ -208,11 +207,11 @@ TEST(ClangImporterTest, libStdCxxInjectionTest) {
EXPECT_EQ(paths.redirectedFiles[0].first,
"/opt/rh/devtoolset-9/root/usr/include/c++/9/libstdcxx.h");
EXPECT_EQ(paths.redirectedFiles[0].second,
"/usr/lib/swift/linux/x86_64/libstdcxx.h");
"/usr/lib/swift/linux/libstdcxx.h");
EXPECT_EQ(paths.redirectedFiles[1].first,
"/opt/rh/devtoolset-9/root/usr/include/c++/9/module.modulemap");
EXPECT_EQ(paths.redirectedFiles[1].second,
"/usr/lib/swift/linux/x86_64/libstdcxx.modulemap");
"/usr/lib/swift/linux/libstdcxx.modulemap");
}

{
Expand All @@ -224,7 +223,7 @@ TEST(ClangImporterTest, libStdCxxInjectionTest) {
EXPECT_EQ(paths.redirectedFiles[0].first,
"/opt/rh/devtoolset-9/root/usr/include/c++/9/libstdcxx.h");
EXPECT_EQ(paths.redirectedFiles[0].second,
"/usr/lib/swift/linux/x86_64/libstdcxx.h");
"/usr/lib/swift/linux/libstdcxx.h");
EXPECT_EQ(paths.overridenFiles[0].first,
"/opt/rh/devtoolset-9/root/usr/include/c++/9/module.modulemap");
EXPECT_NE(paths.overridenFiles[0].second.find(
Expand All @@ -250,7 +249,7 @@ TEST(ClangImporterTest, libStdCxxInjectionTest) {
EXPECT_EQ(paths.redirectedFiles[0].first,
"/opt/rh/devtoolset-9/root/usr/include/c++/9/libstdcxx.h");
EXPECT_EQ(paths.redirectedFiles[0].second,
"/usr/lib/swift/linux/x86_64/libstdcxx.h");
"/usr/lib/swift/linux/libstdcxx.h");
EXPECT_EQ(paths.overridenFiles[0].first,
"/opt/rh/devtoolset-9/root/usr/include/c++/9/module.modulemap");
EXPECT_NE(
Expand Down