[all-commits] [llvm/llvm-project] bf7dc5: [libcxx] [test] Fix valarray UB and MSVC warnings.

Stephan T. Lavavej via All-commits all-commits at lists.llvm.org
Thu Dec 12 18:36:03 PST 2019


  Branch: refs/heads/master
  Home:   https://github.com/llvm/llvm-project
  Commit: bf7dc572f199007cbe042d5ea41bcf873dcedd8f
      https://github.com/llvm/llvm-project/commit/bf7dc572f199007cbe042d5ea41bcf873dcedd8f
  Author: Stephan T. Lavavej <stl at microsoft.com>
  Date:   2019-12-12 (Thu, 12 Dec 2019)

  Changed paths:
    M libcxx/test/std/containers/associative/map/map.erasure/erase_if.pass.cpp
    M libcxx/test/std/containers/associative/multimap/multimap.erasure/erase_if.pass.cpp
    M libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
    M libcxx/test/std/containers/unord/unord.map/erase_if.pass.cpp
    M libcxx/test/std/containers/unord/unord.multimap/erase_if.pass.cpp
    M libcxx/test/std/numerics/numarray/template.valarray/valarray.members/max.pass.cpp
    M libcxx/test/std/numerics/numarray/template.valarray/valarray.members/min.pass.cpp
    M libcxx/test/std/utilities/meta/meta.const.eval/is_constant_evaluated.pass.cpp
    M libcxx/test/support/charconv_test_helpers.h
    M libcxx/test/support/msvc_stdlib_force_include.h

  Log Message:
  -----------
  [libcxx] [test] Fix valarray UB and MSVC warnings.

[libcxx] [test] Calling min and max on an empty valarray is UB.

libcxx/test/std/numerics/numarray/template.valarray/valarray.members/min.pass.cpp
libcxx/test/std/numerics/numarray/template.valarray/valarray.members/max.pass.cpp

The calls `v1.min();` and `v1.max();` were emitting nodiscard warnings
with MSVC's STL. Upon closer inspection, these calls were triggering
undefined behavior. N4842 [valarray.members] says:

"T min() const;
8 Preconditions: size() > 0 is true.
T max() const;
10 Preconditions: size() > 0 is true."

As these tests already provide coverage for non-empty valarrays
(immediately above), I've simply deleted the code for empty valarrays.

[libcxx] [test] Add macros to msvc_stdlib_force_include.h (NFC).

libcxx/test/support/msvc_stdlib_force_include.h

These macros are being used by:
libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/result_of11.pass.cpp
Defining them to nothing allows that test to pass.

[libcxx] [test] Silence MSVC warning C5063 for is_constant_evaluated (NFC).

libcxx/test/std/utilities/meta/meta.const.eval/is_constant_evaluated.pass.cpp

This test is intentionally writing code that MSVC intentionally warns
about, so the warning should be silenced.

Additionally, comment an endif for clarity.

[libcxx] [test] Silence MSVC warning C4127 (NFC).

libcxx/test/support/charconv_test_helpers.h

MSVC avoids emitting this warning when it sees a single constexpr value
being tested, but this condition is a mix of compile-time and run-time.
Using push-disable-pop is the least intrusive way to silence this.

[libcxx] [test] Silence MSVC truncation warning (NFC).

libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp

This test is intentionally truncating float to int, which MSVC
intentionally warns about, so push-disable-pop is necessary.

[libcxx] [test] Avoid truncation warnings in erase_if tests (NFC).

libcxx/test/std/containers/associative/map/map.erasure/erase_if.pass.cpp
libcxx/test/std/containers/associative/multimap/multimap.erasure/erase_if.pass.cpp
libcxx/test/std/containers/unord/unord.map/erase_if.pass.cpp
libcxx/test/std/containers/unord/unord.multimap/erase_if.pass.cpp

These tests use maps with `short` keys and values, emitting MSVC
truncation warnings from `int`. Adding `static_cast` to `key_type`
and `mapped_type` avoids these warnings.

As these tests require C++20 mode (or newer), for brevity I've changed
the multimap tests to use emplace to initialize the test data.
This has no effect on the erase_if testing.




More information about the All-commits mailing list