mirror of
https://github.com/llvm-mirror/libcxx.git
synced 2025-10-24 03:32:35 +08:00
880e38b206
This patch fixes the following bugs, all of which were discovered while testing a 32 bit build on a 64 bit machine. * path.itr/iterator.pass.cpp has undefined behavior. 'path::iterator' stashes the value of the element inside the iterator. This violates the BiDirIterator requirements but is allowed for path::iterator. However this means that using reverse_iterator<path::iterator> has undefined behavior because it assumes that 'Iter tmp = it; return *tmp' will not create a dangling reference. However it does, and this caused this particular test to fail. * path.native.obs/string_alloc.pass.cpp tested the SSO with a long string. On 32 bit builds std::wstring only has the SSO for strings of size 2. The test was using a string of size 4. * fs.op.space/space.pass.cpp had overflows while calculating the expected values. The fix here is to convert the statvfs data members to std::uintmax_t before multiplying them. The internal implementation already does this but the tests needed to do it as well. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@273078 91177308-0d34-0410-b5e6-96231b3b80d8
139 lines
4.2 KiB
C++
139 lines
4.2 KiB
C++
//===----------------------------------------------------------------------===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is dual licensed under the MIT and the University of Illinois Open
|
|
// Source Licenses. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
// UNSUPPORTED: c++98, c++03
|
|
|
|
// <experimental/filesystem>
|
|
|
|
// class path
|
|
|
|
// template <class ECharT, class Traits = char_traits<ECharT>,
|
|
// class Allocator = allocator<ECharT>>
|
|
// basic_string<ECharT, Traits, Allocator>
|
|
// string(const Allocator& a = Allocator()) const;
|
|
|
|
#include <experimental/filesystem>
|
|
#include <type_traits>
|
|
#include <cassert>
|
|
|
|
#include "test_macros.h"
|
|
#include "test_iterators.h"
|
|
#include "count_new.hpp"
|
|
#include "min_allocator.h"
|
|
#include "filesystem_test_helper.hpp"
|
|
|
|
namespace fs = std::experimental::filesystem;
|
|
|
|
// the SSO is always triggered for strings of size 2.
|
|
MultiStringType shortString = MKSTR("a");
|
|
MultiStringType longString = MKSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/123456789/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
|
|
|
|
template <class CharT>
|
|
void doShortStringTest(MultiStringType const& MS) {
|
|
using namespace fs;
|
|
using Ptr = CharT const*;
|
|
using Str = std::basic_string<CharT>;
|
|
using Alloc = std::allocator<CharT>;
|
|
Ptr value = MS;
|
|
const path p((const char*)MS);
|
|
{
|
|
DisableAllocationGuard g;
|
|
Str s = p.string<CharT>();
|
|
assert(s == value);
|
|
Str s2 = p.string<CharT>(Alloc{});
|
|
assert(s2 == value);
|
|
}
|
|
using MAlloc = malloc_allocator<CharT>;
|
|
MAlloc::reset();
|
|
{
|
|
using Traits = std::char_traits<CharT>;
|
|
using AStr = std::basic_string<CharT, Traits, MAlloc>;
|
|
DisableAllocationGuard g;
|
|
AStr s = p.string<CharT, Traits, MAlloc>();
|
|
assert(s == value);
|
|
assert(MAlloc::alloc_count == 0);
|
|
assert(MAlloc::outstanding_alloc() == 0);
|
|
}
|
|
MAlloc::reset();
|
|
{ // Other allocator - provided copy
|
|
using Traits = std::char_traits<CharT>;
|
|
using AStr = std::basic_string<CharT, Traits, MAlloc>;
|
|
DisableAllocationGuard g;
|
|
MAlloc a;
|
|
// don't allow another allocator to be default constructed.
|
|
MAlloc::disable_default_constructor = true;
|
|
AStr s = p.string<CharT, Traits, MAlloc>(a);
|
|
assert(s == value);
|
|
assert(MAlloc::alloc_count == 0);
|
|
assert(MAlloc::outstanding_alloc() == 0);
|
|
}
|
|
MAlloc::reset();
|
|
}
|
|
|
|
template <class CharT>
|
|
void doLongStringTest(MultiStringType const& MS) {
|
|
using namespace fs;
|
|
using Ptr = CharT const*;
|
|
using Str = std::basic_string<CharT>;
|
|
Ptr value = MS;
|
|
const path p((const char*)MS);
|
|
{ // Default allocator
|
|
using Alloc = std::allocator<CharT>;
|
|
Str s = p.string<CharT>();
|
|
assert(s == value);
|
|
Str s2 = p.string<CharT>(Alloc{});
|
|
assert(s2 == value);
|
|
}
|
|
using MAlloc = malloc_allocator<CharT>;
|
|
MAlloc::reset();
|
|
{ // Other allocator - default construct
|
|
using Traits = std::char_traits<CharT>;
|
|
using AStr = std::basic_string<CharT, Traits, MAlloc>;
|
|
DisableAllocationGuard g;
|
|
AStr s = p.string<CharT, Traits, MAlloc>();
|
|
assert(s == value);
|
|
assert(MAlloc::alloc_count > 0);
|
|
assert(MAlloc::outstanding_alloc() == 1);
|
|
}
|
|
MAlloc::reset();
|
|
{ // Other allocator - provided copy
|
|
using Traits = std::char_traits<CharT>;
|
|
using AStr = std::basic_string<CharT, Traits, MAlloc>;
|
|
DisableAllocationGuard g;
|
|
MAlloc a;
|
|
// don't allow another allocator to be default constructed.
|
|
MAlloc::disable_default_constructor = true;
|
|
AStr s = p.string<CharT, Traits, MAlloc>(a);
|
|
assert(s == value);
|
|
assert(MAlloc::alloc_count > 0);
|
|
assert(MAlloc::outstanding_alloc() == 1);
|
|
}
|
|
MAlloc::reset();
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
}
|
|
|
|
int main()
|
|
{
|
|
using namespace fs;
|
|
{
|
|
auto const& S = shortString;
|
|
doShortStringTest<char>(S);
|
|
doShortStringTest<wchar_t>(S);
|
|
doShortStringTest<char16_t>(S);
|
|
doShortStringTest<char32_t>(S);
|
|
}
|
|
{
|
|
auto const& S = longString;
|
|
doLongStringTest<char>(S);
|
|
doLongStringTest<wchar_t>(S);
|
|
doLongStringTest<char16_t>(S);
|
|
doLongStringTest<char32_t>(S);
|
|
}
|
|
}
|