[libcxx-commits] [PATCH] D128084: [libc++] Add CI job testing on FreeBSD

Thu Jan 12 13:55:13 PST 2023

philnik added inline comments.

================
Comment at: libcxx/include/__config:134
 // are deprecated.
-#    if defined(__FreeBSD__)
+#    if defined(__FreeBSD__) && !defined(_LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR)
 #      define _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR
----------------
emaste wrote:
> ldionne wrote:
> > emaste wrote:
> > > philnik wrote:
> > > > emaste wrote:
> > > > > emaste wrote:
> > > > > > should this part be committed independently?
> > > > > Can we commit this separately first?
> > > > I'm sure we can. Just create a patch; though I don't understand why this change is even needed. 
> > > Related to D126462 I suppose, @ldionne?
> > I don't understand the purpose of this change either TBH. If FreeBSD doesn't support the old ABI for pair, I think it should just be removed, so this macro can go away entirely?
> Without this, test fails:
> ```
> # command stderr:
> In file included from /usr/home/buildkite/.buildkite-agent/builds/freebsd-test-1/llvm-project/libcxx-ci/libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/non_trivial_copy_move_ABI.pass.cpp:21:
> In file included from /home/buildkite/.buildkite-agent/builds/freebsd-test-1/llvm-project/libcxx-ci/build/generic-cxx2b/include/c++/v1/utility:240:
> In file included from /home/buildkite/.buildkite-agent/builds/freebsd-test-1/llvm-project/libcxx-ci/build/generic-cxx2b/include/c++/v1/__assert:13:
> /home/buildkite/.buildkite-agent/builds/freebsd-test-1/llvm-project/libcxx-ci/build/generic-cxx2b/include/c++/v1/__config:156:15: error: '_LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR' macro redefined [-Werror,-Wmacro-redefined]
> #      define _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR
>               ^
> <command line>:4:9: note: previous definition is here
> #define _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR 1
>         ^
> 1 error generated.
> 
> error: command failed with exit status: 1
> ```
> 
> 
Let's add `//ADDITIONAL_COMPILE_FLAGS: -Wno-macro-redefined` to `non_trivial_copy_move_ABI.pass.cpp` then. This shouldn't be defined by a user normally.

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D128084/new/

https://reviews.llvm.org/D128084