Page MenuHomePhabricator
Differential D142690

[libc++] Fixes the Clang modular build.
ClosedPublic
Actions

Authored by Mordante on Jan 26 2023, 11:03 PM.

Details

Reviewers
ldionne
Group Reviewers
Restricted Project
Commits
rGa7f8ddc4e2e3: [libc++] Fixes the Clang modular build.
Summary

The patch
430b397f6715d4d2f2569716c93fcd6292ace3dc ("[libc++] Granularize <type_traits> includes in <iterator>") missed some exports in the modulemap with became apparent in the reverting commit 12cb1cb3720d.

This fixes the issue by updating the modulemap. Note that the Clang ICE is not fixed by this change.

Diff Detail

Unit TestsFailed
View All

TimeTest
1,500,270 mslibcxx CI AIX (32-bit) > ibm-libc++-shared-cfg-in.std/algorithms/alg_modifying_operations/alg_transform::ranges.transform.binary.pass.cpp
Script: -- : 'COMPILED WITH'; /opt/clang/clang-15-fa7477eb87fd262898e78db983c7b0951b87641c/bin/clang++ /scratch/powerllvm/cpap8009/llvm-project/libcxx-ci/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/ranges.transform.binary.pass.cpp --target=powerpc-ibm-aix -nostdinc++ -D__LIBC_NO_CPP_MATH_OVERLOADS__ -I /scratch/powerllvm/cpap8009/llvm-project/libcxx-ci/build/aix/include/c++/v1 -I /scratch/powerllvm/cpap8009/llvm-project/libcxx-ci/libcxx/test/support -pthread -std=c++2b -Werror -Wall -Wctad-maybe-unsupported -Wextra -Wshadow -Wundef -Wno-unused-command-line-argument -Wno-attributes -Wno-pessimizing-move -Wno-c++11-extensions -Wno-noexcept-type -Wno-atomic-alignment -Wno-user-defined-literals -Wno-tautological-compare -Wsign-compare -Wunused-variable -Wunused-parameter -Wunreachable-code -Wno-unused-local-typedef -D_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER -D_LIBCPP_ENABLE_EXPERIMENTAL -D_LIBCPP_DISABLE_AVAILABILITY -fcoroutines-ts -Werror=thread-safety -Wuser-defined-warnings -lc++experimental -nostdlib++ -L /scratch/powerllvm/cpap8009/llvm-project/libcxx-ci/build/aix/lib -lc++ -lc++abi -latomic -Wl,-bbigtoc -o /scratch/powerllvm/cpap8009/llvm-project/libcxx-ci/build/aix/test/std/algorithms/alg.modifying.operations/alg.transform/Output/ranges.transform.binary.pass.cpp.dir/t.tmp.exe
2,880 mslibcxx CI Clang-cl (Static) > llvm-libc++-static-clangcl-cfg-in.std/thread/thread_condition/thread_condition_condvar::notify_all.pass.cpp
Script: -- : 'COMPILED WITH'; 'C:/Program Files/LLVM/bin/clang-cl.exe' C:\ws\w7\llvm-project\libcxx-ci\libcxx\test\std\thread\thread.condition\thread.condition.condvar\notify_all.pass.cpp --driver-mode=g++ --target=x86_64-pc-windows-msvc -nostdinc++ -I C:/ws/w7/llvm-project/libcxx-ci/build/clang-cl-static/include/c++/v1 -I C:/ws/w7/llvm-project/libcxx-ci/build/clang-cl-static/include/c++/v1 -I C:/ws/w7/llvm-project/libcxx-ci/libcxx/test/support -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_STDIO_ISO_WIDE_SPECIFIERS -DNOMINMAX -std=c++2b -Werror -Wall -Wctad-maybe-unsupported -Wextra -Wshadow -Wundef -Wno-unused-command-line-argument -Wno-attributes -Wno-pessimizing-move -Wno-c++11-extensions -Wno-noexcept-type -Wno-atomic-alignment -Wno-user-defined-literals -Wno-tautological-compare -Wsign-compare -Wunused-variable -Wunused-parameter -Wunreachable-code -Wno-unused-local-typedef -D_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER -D_LIBCPP_ENABLE_EXPERIMENTAL -D_LIBCPP_DISABLE_AVAILABILITY -fcoroutines-ts -Werror=thread-safety -Wuser-defined-warnings -llibc++experimental -nostdlib -L C:/ws/w7/llvm-project/libcxx-ci/build/clang-cl-static/lib -llibc++ -lmsvcrt -lmsvcprt -loldnames -o C:\ws\w7\llvm-project\libcxx-ci\build\clang-cl-static\test\std\thread\thread.condition\thread.condition.condvar\Output\notify_all.pass.cpp.dir\t.tmp.exe
16,850 mslibcxx CI Clang-cl (Static) > llvm-libc++-static-clangcl-cfg-in.std/thread/thread_condition/thread_condition_condvar::wait_until.pass.cpp
Script: -- : 'COMPILED WITH'; 'C:/Program Files/LLVM/bin/clang-cl.exe' C:\ws\w7\llvm-project\libcxx-ci\libcxx\test\std\thread\thread.condition\thread.condition.condvar\wait_until.pass.cpp --driver-mode=g++ --target=x86_64-pc-windows-msvc -nostdinc++ -I C:/ws/w7/llvm-project/libcxx-ci/build/clang-cl-static/include/c++/v1 -I C:/ws/w7/llvm-project/libcxx-ci/build/clang-cl-static/include/c++/v1 -I C:/ws/w7/llvm-project/libcxx-ci/libcxx/test/support -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_STDIO_ISO_WIDE_SPECIFIERS -DNOMINMAX -std=c++2b -Werror -Wall -Wctad-maybe-unsupported -Wextra -Wshadow -Wundef -Wno-unused-command-line-argument -Wno-attributes -Wno-pessimizing-move -Wno-c++11-extensions -Wno-noexcept-type -Wno-atomic-alignment -Wno-user-defined-literals -Wno-tautological-compare -Wsign-compare -Wunused-variable -Wunused-parameter -Wunreachable-code -Wno-unused-local-typedef -D_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER -D_LIBCPP_ENABLE_EXPERIMENTAL -D_LIBCPP_DISABLE_AVAILABILITY -fcoroutines-ts -Werror=thread-safety -Wuser-defined-warnings -llibc++experimental -nostdlib -L C:/ws/w7/llvm-project/libcxx-ci/build/clang-cl-static/lib -llibc++ -lmsvcrt -lmsvcprt -loldnames -o C:\ws\w7\llvm-project\libcxx-ci\build\clang-cl-static\test\std\thread\thread.condition\thread.condition.condvar\Output\wait_until.pass.cpp.dir\t.tmp.exe
11,040 mslibcxx CI Clang-cl (no vcruntime exceptions) > llvm-libc++-shared-no-vcruntime-clangcl-cfg-in.std/thread/thread_mutex/thread_lock/thread_lock_unique/thread_lock_unique_cons::mutex_duration.pass.cpp
Script: -- : 'COMPILED WITH'; 'C:/Program Files/LLVM/bin/clang-cl.exe' C:\ws\w5\llvm-project\libcxx-ci\libcxx\test\std\thread\thread.mutex\thread.lock\thread.lock.unique\thread.lock.unique.cons\mutex_duration.pass.cpp --driver-mode=g++ --target=x86_64-pc-windows-msvc -nostdinc++ -I C:/ws/w5/llvm-project/libcxx-ci/build/clang-cl-no-vcruntime/include/c++/v1 -I C:/ws/w5/llvm-project/libcxx-ci/build/clang-cl-no-vcruntime/include/c++/v1 -I C:/ws/w5/llvm-project/libcxx-ci/libcxx/test/support -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_STDIO_ISO_WIDE_SPECIFIERS -DNOMINMAX -D_HAS_EXCEPTIONS=0 -std=c++2b -Werror -Wall -Wctad-maybe-unsupported -Wextra -Wshadow -Wundef -Wno-unused-command-line-argument -Wno-attributes -Wno-pessimizing-move -Wno-c++11-extensions -Wno-noexcept-type -Wno-atomic-alignment -Wno-user-defined-literals -Wno-tautological-compare -Wsign-compare -Wunused-variable -Wunused-parameter -Wunreachable-code -Wno-unused-local-typedef -D_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER -D_LIBCPP_DISABLE_AVAILABILITY -fcoroutines-ts -Werror=thread-safety -Wuser-defined-warnings -DTEST_WINDOWS_DLL -nostdlib -L C:/ws/w5/llvm-project/libcxx-ci/build/clang-cl-no-vcruntime/lib -lc++ -lmsvcrt -lmsvcprt -loldnames -o C:\ws\w5\llvm-project\libcxx-ci\build\clang-cl-no-vcruntime\test\std\thread\thread.mutex\thread.lock\thread.lock.unique\thread.lock.unique.cons\Output\mutex_duration.pass.cpp.dir\t.tmp.exe
17,390 mslibcxx CI Clang-cl (no vcruntime exceptions) > llvm-libc++-shared-no-vcruntime-clangcl-cfg-in.std/thread/thread_mutex/thread_mutex_requirements/thread_sharedtimedmutex_requirements/thread_sharedtimedmutex_class::try_lock_shared_for.pass.cpp
Script: -- : 'COMPILED WITH'; 'C:/Program Files/LLVM/bin/clang-cl.exe' C:\ws\w5\llvm-project\libcxx-ci\libcxx\test\std\thread\thread.mutex\thread.mutex.requirements\thread.sharedtimedmutex.requirements\thread.sharedtimedmutex.class\try_lock_shared_for.pass.cpp --driver-mode=g++ --target=x86_64-pc-windows-msvc -nostdinc++ -I C:/ws/w5/llvm-project/libcxx-ci/build/clang-cl-no-vcruntime/include/c++/v1 -I C:/ws/w5/llvm-project/libcxx-ci/build/clang-cl-no-vcruntime/include/c++/v1 -I C:/ws/w5/llvm-project/libcxx-ci/libcxx/test/support -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_STDIO_ISO_WIDE_SPECIFIERS -DNOMINMAX -D_HAS_EXCEPTIONS=0 -std=c++2b -Werror -Wall -Wctad-maybe-unsupported -Wextra -Wshadow -Wundef -Wno-unused-command-line-argument -Wno-attributes -Wno-pessimizing-move -Wno-c++11-extensions -Wno-noexcept-type -Wno-atomic-alignment -Wno-user-defined-literals -Wno-tautological-compare -Wsign-compare -Wunused-variable -Wunused-parameter -Wunreachable-code -Wno-unused-local-typedef -D_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER -D_LIBCPP_DISABLE_AVAILABILITY -fcoroutines-ts -Werror=thread-safety -Wuser-defined-warnings -DTEST_WINDOWS_DLL -nostdlib -L C:/ws/w5/llvm-project/libcxx-ci/build/clang-cl-no-vcruntime/lib -lc++ -lmsvcrt -lmsvcprt -loldnames -o C:\ws\w5\llvm-project\libcxx-ci\build\clang-cl-no-vcruntime\test\std\thread\thread.mutex\thread.mutex.requirements\thread.sharedtimedmutex.requirements\thread.sharedtimedmutex.class\Output\try_lock_shared_for.pass.cpp.dir\t.tmp.exe

Event Timeline

Mordante created this revision.Jan 26 2023, 11:03 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 26 2023, 11:03 PM
Mordante requested review of this revision.Jan 26 2023, 11:03 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJan 26 2023, 11:03 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added subscribers: libcxx-commits, cfe-commits. · View Herald Transcript
Mordante added inline comments.Jan 26 2023, 11:05 PM
libcxx/include/module.modulemap.in
1431

Note this looks wrong from libc++'s perspective. When this "solves" the issue we need to investigate why it fixes it; I think the export belongs to a different header.

Mordante updated this revision to Diff 492648.Jan 26 2023, 11:08 PM

Fix CI run instead of libc++.

Herald added a subscriber: arichardson. · View Herald TranscriptJan 26 2023, 11:08 PM
Mordante mentioned this in rG12cb1cb3720d: Revert "[clang] Instantiate concepts with sugared template arguments".Jan 26 2023, 11:13 PM
Harbormaster completed remote builds in B210280: Diff 492648.Jan 26 2023, 11:40 PM
Mordante updated this revision to Diff 492779.Jan 27 2023, 8:45 AM

Rebased and improve fixes.

Harbormaster completed remote builds in B210377: Diff 492779.Jan 27 2023, 9:53 AM
Mordante updated this revision to Diff 492828.Jan 27 2023, 9:54 AM

Finalized patch.

Mordante updated this revision to Diff 492834.Jan 27 2023, 10:00 AM

Removes uninteded include.

Harbormaster completed remote builds in B210426: Diff 492834.Jan 27 2023, 10:47 AM
Mordante updated this revision to Diff 492999.Jan 28 2023, 6:39 AM

Undo CI changes.

Mordante retitled this revision from [DRAFT][libc++] Fixes the Clang modular build. to [libc++] Fixes the Clang modular build..Jan 28 2023, 6:51 AM
Mordante edited the summary of this revision. (Show Details)

https://buildkite.com/llvm-project/libcxx-ci/builds/18148 shows this patch fixes the Clang modular build.

Harbormaster completed remote builds in B210537: Diff 492999.Jan 28 2023, 8:10 AM
dblaikie added a subscriber: dblaikie.Jan 30 2023, 11:08 AM
ldionne accepted this revision.Jan 30 2023, 1:24 PM
This revision is now accepted and ready to land.Jan 30 2023, 1:24 PM
This revision was landed with ongoing or failed builds.Jan 31 2023, 10:20 AM
Closed by commit rGa7f8ddc4e2e3: [libc++] Fixes the Clang modular build. (authored by Mordante). · Explain Why
This revision was automatically updated to reflect the committed changes.
Mordante added a commit: rGa7f8ddc4e2e3: [libc++] Fixes the Clang modular build..

Revision Contents
Changeset List

PathSize
libcxx/
include/
16 lines

Diff 492999

View Options

libcxx/include/module.modulemap.in

Loading...