From 63ebd3bd24d414737e5404923dcd1b8dbdb8ee46 Mon Sep 17 00:00:00 2001 From: Zhihao Yuan Date: Wed, 1 Aug 2018 05:21:26 +0000 Subject: [PATCH] [libc++] Fix build failures after merging Summary: - fix a stupid unit test typo - add symbols to Linux abilist Reviewers: EricWF Subscribers: christof, ldionne, cfe-commits Differential Revision: https://reviews.llvm.org/D50130 llvm-svn: 338486 --- libcxx/lib/abi/x86_64-unknown-linux-gnu.v1.abilist | 2 ++ .../test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp | 1 + libcxx/test/support/charconv_test_helpers.h | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libcxx/lib/abi/x86_64-unknown-linux-gnu.v1.abilist b/libcxx/lib/abi/x86_64-unknown-linux-gnu.v1.abilist index c883a59..833342c 100644 --- a/libcxx/lib/abi/x86_64-unknown-linux-gnu.v1.abilist +++ b/libcxx/lib/abi/x86_64-unknown-linux-gnu.v1.abilist @@ -1192,6 +1192,8 @@ {'name': '_ZNSt3__15wclogE', 'is_defined': True, 'type': 'OBJECT', 'size': 160} {'name': '_ZNSt3__15wcoutE', 'is_defined': True, 'type': 'OBJECT', 'size': 160} {'name': '_ZNSt3__16__clocEv', 'is_defined': True, 'type': 'FUNC'} +{'name': '_ZNSt3__16__itoa8__u64toaEmPc', 'is_defined': True, 'type': 'FUNC'} +{'name': '_ZNSt3__16__itoa8__u32toaEjPc', 'is_defined': True, 'type': 'FUNC'} {'name': '_ZNSt3__16__sortIRNS_6__lessIaaEEPaEEvT0_S5_T_', 'is_defined': True, 'type': 'FUNC'} {'name': '_ZNSt3__16__sortIRNS_6__lessIccEEPcEEvT0_S5_T_', 'is_defined': True, 'type': 'FUNC'} {'name': '_ZNSt3__16__sortIRNS_6__lessIddEEPdEEvT0_S5_T_', 'is_defined': True, 'type': 'FUNC'} diff --git a/libcxx/test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp b/libcxx/test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp index e5a93b49..3fc533a 100644 --- a/libcxx/test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp +++ b/libcxx/test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp @@ -37,6 +37,7 @@ struct test_basics : roundtrip_test_base using xl = std::numeric_limits; test(1, b); + test(-1, b); test(xl::lowest(), b); test((xl::max)(), b); test((xl::max)() / 2, b); diff --git a/libcxx/test/support/charconv_test_helpers.h b/libcxx/test/support/charconv_test_helpers.h index df1b00a6..1560fa7 100644 --- a/libcxx/test/support/charconv_test_helpers.h +++ b/libcxx/test/support/charconv_test_helpers.h @@ -178,7 +178,7 @@ struct roundtrip_test_base { assert(x == 0xc); assert(r2.ptr == buf); - assert(r.ec == std::errc::invalid_argument); + assert(r2.ec == std::errc::invalid_argument); } else { -- 2.7.4