LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[libcxx] [test] Fix MSVC warnings, null pointer deref.

Browse Source 
test/std/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp
Silence MSVC warning C4244. This is expected when passing
floating-point values for size.

test/std/utilities/template.bitset/bitset.members/to_ullong.pass.cpp
test/std/utilities/template.bitset/bitset.members/to_ulong.pass.cpp
Avoid MSVC "warning C4293: '<<': shift count negative or too big,
undefined behavior". MSVC sees (1ULL << N) and warns - being guarded
by const bool canFit is insufficient. A small change to the code
avoids the warning without the need for a pragma.

Remove a spurious printf() declaration from to_ullong.pass.cpp.

Change ULL to UL in to_ulong.pass.cpp. The ULL suffix was
probably copy-pasted.

test/std/utilities/tuple/tuple.general/ignore.pass.cpp
Use LIBCPP_STATIC_ASSERT for consistency with other files.

test/support/container_test_types.h
Fix a null pointer dereference, found by MSVC /analyze
warning C6011 "Dereferencing NULL pointer 'm_expected_args'."

Fixes D41030.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@320535 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Stephan T. Lavavej
2017-12-13 00:51:27 +00:00
parent e445521637
commit dd2a900c0b
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/std/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp
View File

@@ -15,6 +15,10 @@
// void // void
// generate_n(Iter first, Size n, Generator gen); // generate_n(Iter first, Size n, Generator gen);
#ifdef _MSC_VER
#pragma warning(disable: 4244) // conversion from 'const double' to 'int', possible loss of data
#endif
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>

3
test/std/utilities/template.bitset/bitset.members/to_ullong.pass.cpp
View File

@@ -8,7 +8,6 @@
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// test unsigned long long to_ullong() const; // test unsigned long long to_ullong() const;
extern "C" int printf(const char *, ...);
#include <bitset> #include <bitset>
#include <algorithm> #include <algorithm>
@@ -40,7 +39,7 @@ void test_to_ullong()
{ // test values bigger than can fit into the bitset { // test values bigger than can fit into the bitset
const unsigned long long val = 0x55AAAAFFFFAAAA55ULL; const unsigned long long val = 0x55AAAAFFFFAAAA55ULL;
const bool canFit = N < sizeof(unsigned long long) * CHAR_BIT; const bool canFit = N < sizeof(unsigned long long) * CHAR_BIT;
const unsigned long long mask = canFit ? (1ULL << N) - 1 : (unsigned long long)(-1); const unsigned long long mask = canFit ? (1ULL << (canFit ? N : 0)) - 1 : (unsigned long long)(-1); // avoid compiler warnings
std::bitset<N> v(val); std::bitset<N> v(val);
assert(v.to_ullong() == (val & mask)); // we shouldn't return bit patterns from outside the limits of the bitset. assert(v.to_ullong() == (val & mask)); // we shouldn't return bit patterns from outside the limits of the bitset.
} }

4
test/std/utilities/template.bitset/bitset.members/to_ulong.pass.cpp
View File

@@ -39,9 +39,9 @@ void test_to_ulong()
} }
{ // test values bigger than can fit into the bitset { // test values bigger than can fit into the bitset
const unsigned long val = 0x5AFFFFA5ULL; const unsigned long val = 0x5AFFFFA5UL;
const bool canFit = N < sizeof(unsigned long) * CHAR_BIT; const bool canFit = N < sizeof(unsigned long) * CHAR_BIT;
const unsigned long mask = canFit ? (1ULL << N) - 1 : (unsigned long)(-1); const unsigned long mask = canFit ? (1UL << (canFit ? N : 0)) - 1 : (unsigned long)(-1); // avoid compiler warnings
std::bitset<N> v(val); std::bitset<N> v(val);
assert(v.to_ulong() == (val & mask)); // we shouldn't return bit patterns from outside the limits of the bitset. assert(v.to_ulong() == (val & mask)); // we shouldn't return bit patterns from outside the limits of the bitset.
} }

4
test/std/utilities/tuple/tuple.general/ignore.pass.cpp
View File

@@ -48,9 +48,7 @@ int main() {
{ {
static_assert(test_ignore_constexpr(), ""); static_assert(test_ignore_constexpr(), "");
} }
#if defined(_LIBCPP_VERSION)
{ {
static_assert(std::is_trivial<decltype(std::ignore)>::value, ""); LIBCPP_STATIC_ASSERT(std::is_trivial<decltype(std::ignore)>::value, "");
} }
#endif
} }

4
test/support/container_test_types.h
View File

@@ -167,8 +167,10 @@ struct AllocatorConstructController {
// Return true if the construction was expected and false otherwise. // Return true if the construction was expected and false otherwise.
// This should only be called by 'Allocator.construct'. // This should only be called by 'Allocator.construct'.
bool check(detail::TypeID const& tid) { bool check(detail::TypeID const& tid) {
if (!m_expected_args) if (!m_expected_args) {
assert(m_allow_unchecked); assert(m_allow_unchecked);
return m_allow_unchecked;
}
bool res = *m_expected_args == tid; bool res = *m_expected_args == tid;
if (m_expected_count == -1 || --m_expected_count == -1) if (m_expected_count == -1 || --m_expected_count == -1)
m_expected_args = nullptr; m_expected_args = nullptr;