From 105a3061f737f4d72bf9cba258f5b2fd991d7162 Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Tue, 13 Dec 2016 01:54:58 +0000 Subject: [PATCH] [libcxx] [test] Fix size_t-to-int truncation warnings in syserr.hash. After r289363, these tests were triggering MSVC x64 warning C4267 "conversion from 'size_t' to 'int', possible loss of data" by taking 0, 2, and 10 as std::size_t, then constructing error_code(int, const error_category&) or error_condition(int, const error_category&) from that (N4618 19.5.3.2 [syserr.errcode.constructors]/3, 19.5.4.2 [syserr.errcondition.constructors]/3). The fix is simple: take these ints as int, pass them to the int-taking constructor, and perform a value-preserving static_cast when comparing them to `std::size_t result`. Fixes D27691. llvm-svn: 289512 --- libcxx/test/std/diagnostics/syserr/syserr.hash/error_code.pass.cpp | 4 ++-- .../test/std/diagnostics/syserr/syserr.hash/error_condition.pass.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libcxx/test/std/diagnostics/syserr/syserr.hash/error_code.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.hash/error_code.pass.cpp index 04606e8..4091f44 100644 --- a/libcxx/test/std/diagnostics/syserr/syserr.hash/error_code.pass.cpp +++ b/libcxx/test/std/diagnostics/syserr/syserr.hash/error_code.pass.cpp @@ -23,7 +23,7 @@ #include "test_macros.h" void -test(std::size_t i) +test(int i) { typedef std::error_code T; typedef std::hash H; @@ -32,7 +32,7 @@ test(std::size_t i) H h; T ec(i, std::system_category()); const std::size_t result = h(ec); - LIBCPP_ASSERT(result == i); + LIBCPP_ASSERT(result == static_cast(i)); ((void)result); // Prevent unused warning } diff --git a/libcxx/test/std/diagnostics/syserr/syserr.hash/error_condition.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.hash/error_condition.pass.cpp index e520b54..d455210 100644 --- a/libcxx/test/std/diagnostics/syserr/syserr.hash/error_condition.pass.cpp +++ b/libcxx/test/std/diagnostics/syserr/syserr.hash/error_condition.pass.cpp @@ -23,7 +23,7 @@ #include "test_macros.h" void -test(std::size_t i) +test(int i) { typedef std::error_condition T; typedef std::hash H; @@ -32,7 +32,7 @@ test(std::size_t i) H h; T ec(i, std::system_category()); const std::size_t result = h(ec); - LIBCPP_ASSERT(result == i); + LIBCPP_ASSERT(result == static_cast(i)); ((void)result); // Prevent unused warning } -- 2.7.4