Merge remote branch 'llvm.org/master' into clang

change RC_BUILDIT to RC_XBS for detecting Apple build environment
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@130970 91177308-0d34-0410-b5e6-96231b3b80d8
2011-05-09 12:27:44 +09:00 · 2011-05-06 01:13:20 +00:00 · 2011-05-01 21:52:09 +09:00 · 2011-05-01 21:52:08 +09:00 · 2011-05-01 21:52:08 +09:00 · 2011-05-01 21:52:08 +09:00
539 changed files with 13 additions and 54 deletions
--- a/include/__locale
+++ b/include/__locale
@@ -451,7 +451,7 @@ public:
    _LIBCPP_ALWAYS_INLINE
    bool is(mask __m, char_type __c) const
    {
-        return isascii(__c) ? __tab_[__c] & __m : false;
+        return isascii(__c) ? (__tab_ ? __tab_[__c] & __m : isctype(__c, __m)) : false;
    }

    _LIBCPP_ALWAYS_INLINE
--- a/include/__std_stream
+++ b/include/__std_stream
@@ -288,12 +288,12 @@ __stdoutbuf<_CharT>::sync()
        __r = __cv_->unshift(__st_, __extbuf,
                                    __extbuf + sizeof(__extbuf),
                                    __extbe);
+        if (__r == codecvt_base::error)
+            return -1;
        size_t __nmemb = static_cast<size_t>(__extbe - __extbuf);
        if (fwrite(__extbuf, 1, __nmemb, __file_) != __nmemb)
            return -1;
    } while (__r == codecvt_base::partial);
-    if (__r == codecvt_base::error)
-        return -1;
    if (fflush(__file_))
        return -1;
    return 0;
--- a/lib/buildit
+++ b/lib/buildit
@@ -34,7 +34,7 @@ fi

 case $TRIPLE in
  *-apple-*)
-    if [ -z $RC_BUILDIT ]
+    if [ -z $RC_XBS ]
    then
      RC_CFLAGS="-arch i386 -arch x86_64"
    fi
@@ -79,7 +79,7 @@ case $TRIPLE in
    ;;
 esac

-if [ -z $RC_BUILDIT ]
+if [ -z $RC_XBS ]
 then
    rm -f libc++.1.$SOEXT*
 fi
@@ -95,7 +95,7 @@ $CC *.o $RC_CFLAGS $LDSHARED_FLAGS $EXTRA_FLAGS

 #libtool -static -o libc++.a *.o

-if [ -z $RC_BUILDIT ]
+if [ -z $RC_XBS ]
 then
    rm *.o
 fi
--- a/test/algorithms/alg.sorting/alg.min.max/max_init_list.fail.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/max_init_list.fail.cpp
--- a/test/algorithms/alg.sorting/alg.min.max/max_init_list_comp.fail.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/max_init_list_comp.fail.cpp
--- a/test/algorithms/alg.sorting/alg.min.max/min_init_list.fail.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/min_init_list.fail.cpp
--- a/test/algorithms/alg.sorting/alg.min.max/min_init_list_comp.fail.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/min_init_list_comp.fail.cpp
--- a/test/algorithms/alg.sorting/alg.min.max/minmax_init_list.fail.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/minmax_init_list.fail.cpp
--- a/test/algorithms/alg.sorting/alg.min.max/minmax_init_list_comp.fail.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/minmax_init_list_comp.fail.cpp
--- a/test/atomics/atomics.fences/atomic_signal_fence.fail.cpp
+++ b/test/atomics/atomics.fences/atomic_signal_fence.fail.cpp
--- a/test/atomics/atomics.fences/atomic_thread_fence.fail.cpp
+++ b/test/atomics/atomics.fences/atomic_thread_fence.fail.cpp
--- a/test/atomics/atomics.flag/atomic_flag_clear.fail.cpp
+++ b/test/atomics/atomics.flag/atomic_flag_clear.fail.cpp
--- a/test/atomics/atomics.flag/atomic_flag_clear_explicit.fail.cpp
+++ b/test/atomics/atomics.flag/atomic_flag_clear_explicit.fail.cpp
--- a/test/atomics/atomics.flag/atomic_flag_test_and_set.fail.cpp
+++ b/test/atomics/atomics.flag/atomic_flag_test_and_set.fail.cpp
--- a/test/atomics/atomics.flag/atomic_flag_test_and_set_explicit.fail.cpp
+++ b/test/atomics/atomics.flag/atomic_flag_test_and_set_explicit.fail.cpp
--- a/test/atomics/atomics.flag/clear.fail.cpp
+++ b/test/atomics/atomics.flag/clear.fail.cpp
--- a/test/atomics/atomics.flag/default.fail.cpp
+++ b/test/atomics/atomics.flag/default.fail.cpp
--- a/test/atomics/atomics.flag/init.fail.cpp
+++ b/test/atomics/atomics.flag/init.fail.cpp
--- a/test/atomics/atomics.flag/test_and_set.fail.cpp
+++ b/test/atomics/atomics.flag/test_and_set.fail.cpp
--- a/test/atomics/atomics.lockfree/lockfree.fail.cpp
+++ b/test/atomics/atomics.lockfree/lockfree.fail.cpp
--- a/test/atomics/atomics.order/kill_dependency.fail.cpp
+++ b/test/atomics/atomics.order/kill_dependency.fail.cpp
--- a/test/atomics/atomics.order/memory_order.fail.cpp
+++ b/test/atomics/atomics.order/memory_order.fail.cpp
--- a/test/atomics/atomics.types.generic/address.fail.cpp
+++ b/test/atomics/atomics.types.generic/address.fail.cpp
--- a/test/atomics/atomics.types.generic/bool.fail.cpp
+++ b/test/atomics/atomics.types.generic/bool.fail.cpp
--- a/test/atomics/atomics.types.generic/cstdint_typedefs.fail.cpp
+++ b/test/atomics/atomics.types.generic/cstdint_typedefs.fail.cpp
--- a/test/atomics/atomics.types.generic/integral.fail.cpp
+++ b/test/atomics/atomics.types.generic/integral.fail.cpp
--- a/test/atomics/atomics.types.generic/integral_typedefs.fail.cpp
+++ b/test/atomics/atomics.types.generic/integral_typedefs.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_is_lock_free.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_is_lock_free.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.fail.cpp
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.fail.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.fail.cpp
--- a/test/atomics/version.fail.cpp
+++ b/test/atomics/version.fail.cpp
--- a/test/containers/associative/map/map.cons/assign_initializer_list.fail.cpp
+++ b/test/containers/associative/map/map.cons/assign_initializer_list.fail.cpp
--- a/test/containers/associative/map/map.cons/initializer_list.fail.cpp
+++ b/test/containers/associative/map/map.cons/initializer_list.fail.cpp
--- a/test/containers/associative/map/map.cons/initializer_list_compare.fail.cpp
+++ b/test/containers/associative/map/map.cons/initializer_list_compare.fail.cpp
--- a/test/containers/associative/map/map.cons/initializer_list_compare_alloc.fail.cpp
+++ b/test/containers/associative/map/map.cons/initializer_list_compare_alloc.fail.cpp
--- a/test/containers/associative/map/map.modifiers/insert_initializer_list.fail.cpp
+++ b/test/containers/associative/map/map.modifiers/insert_initializer_list.fail.cpp
--- a/test/containers/associative/multimap/multimap.cons/assign_initializer_list.fail.cpp
+++ b/test/containers/associative/multimap/multimap.cons/assign_initializer_list.fail.cpp
--- a/test/containers/associative/multimap/multimap.cons/initializer_list.fail.cpp
+++ b/test/containers/associative/multimap/multimap.cons/initializer_list.fail.cpp
--- a/test/containers/associative/multimap/multimap.cons/initializer_list_compare.fail.cpp
+++ b/test/containers/associative/multimap/multimap.cons/initializer_list_compare.fail.cpp
--- a/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.fail.cpp
+++ b/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.fail.cpp
--- a/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.fail.cpp
+++ b/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.fail.cpp
--- a/test/containers/associative/multiset/insert_initializer_list.fail.cpp
+++ b/test/containers/associative/multiset/insert_initializer_list.fail.cpp
--- a/test/containers/associative/multiset/multiset.cons/assign_initializer_list.fail.cpp
+++ b/test/containers/associative/multiset/multiset.cons/assign_initializer_list.fail.cpp
--- a/test/containers/associative/multiset/multiset.cons/initializer_list.fail.cpp
+++ b/test/containers/associative/multiset/multiset.cons/initializer_list.fail.cpp
--- a/test/containers/associative/multiset/multiset.cons/initializer_list_compare.fail.cpp
+++ b/test/containers/associative/multiset/multiset.cons/initializer_list_compare.fail.cpp
--- a/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.fail.cpp
+++ b/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.fail.cpp
--- a/test/containers/associative/set/insert_initializer_list.fail.cpp
+++ b/test/containers/associative/set/insert_initializer_list.fail.cpp
--- a/test/containers/associative/set/set.cons/assign_initializer_list.fail.cpp
+++ b/test/containers/associative/set/set.cons/assign_initializer_list.fail.cpp
--- a/test/containers/associative/set/set.cons/initializer_list.fail.cpp
+++ b/test/containers/associative/set/set.cons/initializer_list.fail.cpp
--- a/test/containers/associative/set/set.cons/initializer_list_compare.fail.cpp
+++ b/test/containers/associative/set/set.cons/initializer_list_compare.fail.cpp
--- a/test/containers/associative/set/set.cons/initializer_list_compare_alloc.fail.cpp
+++ b/test/containers/associative/set/set.cons/initializer_list_compare_alloc.fail.cpp
--- a/test/containers/sequences/deque/deque.cons/assign_initializer_list.fail.cpp
+++ b/test/containers/sequences/deque/deque.cons/assign_initializer_list.fail.cpp
--- a/test/containers/sequences/deque/deque.cons/initializer_list.fail.cpp
+++ b/test/containers/sequences/deque/deque.cons/initializer_list.fail.cpp
--- a/test/containers/sequences/deque/deque.cons/initializer_list_alloc.fail.cpp
+++ b/test/containers/sequences/deque/deque.cons/initializer_list_alloc.fail.cpp
--- a/test/containers/sequences/deque/deque.cons/op_equal_initializer_list.fail.cpp
+++ b/test/containers/sequences/deque/deque.cons/op_equal_initializer_list.fail.cpp
--- a/test/containers/sequences/deque/deque.modifiers/insert_iter_initializer_list.fail.cpp
+++ b/test/containers/sequences/deque/deque.modifiers/insert_iter_initializer_list.fail.cpp
--- a/test/containers/sequences/forwardlist/forwardlist.cons/assign_init.fail.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/assign_init.fail.cpp
--- a/test/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.fail.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.fail.cpp
--- a/test/containers/sequences/forwardlist/forwardlist.cons/init.fail.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/init.fail.cpp
--- a/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.fail.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.fail.cpp
--- a/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.fail.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.fail.cpp
--- a/test/containers/sequences/list/list.cons/assign_initializer_list.fail.cpp
+++ b/test/containers/sequences/list/list.cons/assign_initializer_list.fail.cpp
--- a/test/containers/sequences/list/list.cons/initializer_list.fail.cpp
+++ b/test/containers/sequences/list/list.cons/initializer_list.fail.cpp
--- a/test/containers/sequences/list/list.cons/initializer_list_alloc.fail.cpp
+++ b/test/containers/sequences/list/list.cons/initializer_list_alloc.fail.cpp
--- a/test/containers/sequences/list/list.cons/op_equal_initializer_list.fail.cpp
+++ b/test/containers/sequences/list/list.cons/op_equal_initializer_list.fail.cpp
--- a/test/containers/sequences/list/list.modifiers/insert_iter_initializer_list.fail.cpp
+++ b/test/containers/sequences/list/list.modifiers/insert_iter_initializer_list.fail.cpp
--- a/test/containers/sequences/vector.bool/assign_initializer_list.fail.cpp
+++ b/test/containers/sequences/vector.bool/assign_initializer_list.fail.cpp
--- a/test/containers/sequences/vector.bool/initializer_list.fail.cpp
+++ b/test/containers/sequences/vector.bool/initializer_list.fail.cpp
--- a/test/containers/sequences/vector.bool/initializer_list_alloc.fail.cpp
+++ b/test/containers/sequences/vector.bool/initializer_list_alloc.fail.cpp
--- a/test/containers/sequences/vector.bool/insert_iter_initializer_list.fail.cpp
+++ b/test/containers/sequences/vector.bool/insert_iter_initializer_list.fail.cpp
--- a/test/containers/sequences/vector.bool/op_equal_initializer_list.fail.cpp
+++ b/test/containers/sequences/vector.bool/op_equal_initializer_list.fail.cpp
--- a/test/containers/sequences/vector/vector.cons/assign_initializer_list.fail.cpp
+++ b/test/containers/sequences/vector/vector.cons/assign_initializer_list.fail.cpp
--- a/test/containers/sequences/vector/vector.cons/initializer_list.fail.cpp
+++ b/test/containers/sequences/vector/vector.cons/initializer_list.fail.cpp
--- a/test/containers/sequences/vector/vector.cons/initializer_list_alloc.fail.cpp
+++ b/test/containers/sequences/vector/vector.cons/initializer_list_alloc.fail.cpp
--- a/test/containers/sequences/vector/vector.cons/op_equal_initializer_list.fail.cpp
+++ b/test/containers/sequences/vector/vector.cons/op_equal_initializer_list.fail.cpp
--- a/test/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.fail.cpp
+++ b/test/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.fail.cpp
--- a/test/containers/unord/unord.map/unord.map.cnstr/assign_init.fail.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/assign_init.fail.cpp
--- a/test/containers/unord/unord.map/unord.map.cnstr/init.fail.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/init.fail.cpp
--- a/test/containers/unord/unord.map/unord.map.cnstr/init_size.fail.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/init_size.fail.cpp
--- a/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.fail.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.fail.cpp
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
NAKAMURA Takumi	307c285079	Merge remote branch 'llvm.org/master' into clang	2011-05-09 12:27:44 +09:00
Nick Kledzik	d982028b92	change RC_BUILDIT to RC_XBS for detecting Apple build environment git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@130970 91177308-0d34-0410-b5e6-96231b3b80d8	2011-05-06 01:13:20 +00:00
NAKAMURA Takumi	cb430f3a47	test: Mark 316 tests as XFAIL to rename to xfail.pass.cpp.	2011-05-01 21:52:09 +09:00
NAKAMURA Takumi	d3665e1d9d	test/lit.cfg: Add .xfail.pass.cpp, to expect compiling successfully and to fail to run.	2011-05-01 21:52:08 +09:00
NAKAMURA Takumi	6911fb59fd	Mark 218 tests as fail to compile lack of C++0x features.	2011-05-01 21:52:08 +09:00
NAKAMURA Takumi	a177c5da7b	test/lit.cfg: Python-2.4 does not accept "delete" in tempfile.NamedTemporaryFile.	2011-05-01 21:52:08 +09:00
NAKAMURA Takumi	352c9e1a46	__std_stream: Fix error checking in __stdoutbuf<_CharT>::sync().	2011-05-01 21:52:08 +09:00
NAKAMURA Takumi	710f61ba2a	include/__locale: Tweak __tab_. FIXME: wip! wip!	2011-05-01 21:52:08 +09:00