+2018-07-26 Jonathan Wakely <jwakely@redhat.com>
+
+ * include/bits/atomic_futex.h [!_GLIBCXX_USE_C99_STDINT_TR1]
+ (__atomic_futex_unsigned_base): Remove dependency on
+ _GLIBCXX_USE_C99_STDINT_TR1 macro.
+ * include/bits/unique_lock.h [!_GLIBCXX_USE_C99_STDINT_TR1]
+ (unique_lock): Remove dependency on _GLIBCXX_USE_C99_STDINT_TR1.
+ * include/c_global/cstdint [!_GLIBCXX_USE_C99_STDINT_TR1] (intmax_t)
+ (uintmax_t): Define using predefined macros.
+ * include/std/chrono [!_GLIBCXX_USE_C99_STDINT_TR1] (duration)
+ (time_point, system_clock, high_resolution_clock, steady_clock): Remove
+ dependency on _GLIBCXX_USE_C99_STDINT_TR1 macro.
+ (nanoseconds, microseconds, milliseconds, seconds, minutes, hours):
+ [!_GLIBCXX_USE_C99_STDINT_TR1]: Define using __INT64_TYPE__ or
+ long long when <stdint.h> is not usable.
+ * include/std/condition_variable [!_GLIBCXX_USE_C99_STDINT_TR1]
+ (condition_variable, condition_variable_any): Remove dependency on
+ _GLIBCXX_USE_C99_STDINT_TR1.
+ * include/std/future [!_GLIBCXX_USE_C99_STDINT_TR1] (future, promise)
+ (packaged_task, async): Likewise.
+ * include/std/mutex [!_GLIBCXX_USE_C99_STDINT_TR1] (recursive_mutex)
+ (timed_mutex, recursive_timed_mutex, try_lock, lock, scoped_lock)
+ (once_flag, call_once): Likewise.
+ * include/std/ratio [!_GLIBCXX_USE_C99_STDINT_TR1] (ratio): Likewise.
+ * include/std/shared_mutex [!_GLIBCXX_USE_C99_STDINT_TR1]
+ (shared_mutex, shared_timed_mutex, shared_lock): Likewise.
+ * include/std/thread [!_GLIBCXX_USE_C99_STDINT_TR1] (thread)
+ (this_thread::get_id, this_thread::yield, this_thread::sleep_for)
+ (this_thread::sleep_until): Likewise.
+ * src/c++11/chrono.cc: Remove dependency on
+ _GLIBCXX_USE_C99_STDINT_TR1 macro.
+ * src/c++11/condition_variable.cc: Likewise.
+ * src/c++11/futex.cc: Likewise.
+ * src/c++11/future.cc: Likewise.
+ * src/c++11/mutex.cc: Likewise.
+ * src/c++11/thread.cc: Likewise.
+ * testsuite/20_util/duration/literals/range_neg.cc: Adjust dg-error.
+ * testsuite/20_util/duration/requirements/typedefs_neg1.cc: Likewise.
+ * testsuite/20_util/duration/requirements/typedefs_neg2.cc: Likewise.
+ * testsuite/20_util/duration/requirements/typedefs_neg3.cc: Likewise.
+ * testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Likewise.
+ * testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Likewise.
+
2018-07-26 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR libstdc++/77691
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
-#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
+#ifdef _GLIBCXX_HAS_GTHREADS
#if defined(_GLIBCXX_HAVE_LINUX_FUTEX) && ATOMIC_INT_LOCK_FREE > 1
struct __atomic_futex_unsigned_base
{
};
#endif // _GLIBCXX_HAVE_LINUX_FUTEX && ATOMIC_INT_LOCK_FREE > 1
-#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
+#endif // _GLIBCXX_HAS_GTHREADS
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std
// XXX calling thread owns mutex
}
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
template<typename _Clock, typename _Duration>
unique_lock(mutex_type& __m,
const chrono::time_point<_Clock, _Duration>& __atime)
: _M_device(std::__addressof(__m)),
_M_owns(_M_device->try_lock_for(__rtime))
{ }
-#endif
~unique_lock()
{
}
}
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
template<typename _Clock, typename _Duration>
bool
try_lock_until(const chrono::time_point<_Clock, _Duration>& __atime)
return _M_owns;
}
}
-#endif
void
unlock()
# include <stdint.h>
#endif
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-
namespace std
{
+#ifdef _GLIBCXX_USE_C99_STDINT_TR1
using ::int8_t;
using ::int16_t;
using ::int32_t;
using ::uintmax_t;
using ::uintptr_t;
-} // namespace std
-
+#else // !_GLIBCXX_USE_C99_STDINT_TR1
+ // Define the minimum needed for <ratio>, <chrono> etc.
+ using intmax_t = __INTMAX_TYPE__;
+ using uintmax_t = __UINTMAX_TYPE__;
#endif // _GLIBCXX_USE_C99_STDINT_TR1
+} // namespace std
#endif // C++11
#include <ctime>
#include <bits/parse_numbers.h> // for literals support.
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
const duration<_Rep2, _Period2>& __rhs)
{ return !(__lhs < __rhs); }
+#ifdef _GLIBCXX_USE_C99_STDINT_TR1
+# define _GLIBCXX_CHRONO_INT64_T int64_t
+#elif defined __INT64_TYPE__
+# define _GLIBCXX_CHRONO_INT64_T __INT64_TYPE__
+#else
+ static_assert(std::numeric_limits<unsigned long long>::digits >= 64,
+ "Representation type for nanoseconds must have at least 64 bits");
+# define _GLIBCXX_CHRONO_INT64_T long long
+#endif
+
/// nanoseconds
- typedef duration<int64_t, nano> nanoseconds;
+ typedef duration<_GLIBCXX_CHRONO_INT64_T, nano> nanoseconds;
/// microseconds
- typedef duration<int64_t, micro> microseconds;
+ typedef duration<_GLIBCXX_CHRONO_INT64_T, micro> microseconds;
/// milliseconds
- typedef duration<int64_t, milli> milliseconds;
+ typedef duration<_GLIBCXX_CHRONO_INT64_T, milli> milliseconds;
/// seconds
- typedef duration<int64_t> seconds;
+ typedef duration<_GLIBCXX_CHRONO_INT64_T> seconds;
/// minutes
- typedef duration<int64_t, ratio< 60>> minutes;
+ typedef duration<_GLIBCXX_CHRONO_INT64_T, ratio< 60>> minutes;
/// hours
- typedef duration<int64_t, ratio<3600>> hours;
+ typedef duration<_GLIBCXX_CHRONO_INT64_T, ratio<3600>> hours;
+
+#undef _GLIBCXX_CHRONO_INT64_T
/// time_point
template<typename _Clock, typename _Dur>
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std
-#endif //_GLIBCXX_USE_C99_STDINT_TR1
-
#endif // C++11
#endif //_GLIBCXX_CHRONO
#include <bits/shared_ptr.h>
#include <bits/cxxabi_forced.h>
-#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
+#if defined(_GLIBCXX_HAS_GTHREADS)
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
-#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
-
+#endif // _GLIBCXX_HAS_GTHREADS
#endif // C++11
-
#endif // _GLIBCXX_CONDITION_VARIABLE
future<__async_result_of<_Fn, _Args...>>
async(_Fn&& __fn, _Args&&... __args);
-#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
+#if defined(_GLIBCXX_HAS_GTHREADS)
/// Base class and enclosing scope.
struct __future_base
}
#endif // _GLIBCXX_ASYNC_ABI_COMPAT
-#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
+#endif // _GLIBCXX_HAS_GTHREADS
// @} group futures
_GLIBCXX_END_NAMESPACE_VERSION
# include <bits/std_function.h>
#endif
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// @} group mutexes
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
-#endif // _GLIBCXX_USE_C99_STDINT_TR1
#endif // C++11
#else
#include <type_traits>
-#include <cstdint>
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
+#include <cstdint> // intmax_t, uintmax_t
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
-#endif //_GLIBCXX_USE_C99_STDINT_TR1
-
#endif // C++11
#endif //_GLIBCXX_RATIO
* @{
*/
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
#ifdef _GLIBCXX_HAS_GTHREADS
#if __cplusplus >= 201703L
swap(shared_lock<_Mutex>& __x, shared_lock<_Mutex>& __y) noexcept
{ __x.swap(__y); }
-#endif // _GLIBCXX_USE_C99_STDINT_TR1
-
// @} group mutexes
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
#include <bits/invoke.h>
#include <bits/gthr.h>
-#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
+#if defined(_GLIBCXX_HAS_GTHREADS)
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
-#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
+#endif // _GLIBCXX_HAS_GTHREADS
#endif // C++11
#include <bits/c++config.h>
#include <chrono>
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-
// Conditional inclusion of sys/time.h for gettimeofday
#if !defined(_GLIBCXX_USE_CLOCK_MONOTONIC) && \
!defined(_GLIBCXX_USE_CLOCK_REALTIME) && \
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std
-
-#endif // _GLIBCXX_USE_C99_STDINT_TR1
#include <condition_variable>
#include <cstdlib>
-#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
+#ifdef _GLIBCXX_HAS_GTHREADS
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
-#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
+#endif // _GLIBCXX_HAS_GTHREADS
// <http://www.gnu.org/licenses/>.
#include <bits/atomic_futex.h>
-#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
+#ifdef _GLIBCXX_HAS_GTHREADS
#if defined(_GLIBCXX_HAVE_LINUX_FUTEX) && ATOMIC_INT_LOCK_FREE > 1
#include <chrono>
#include <climits>
_GLIBCXX_END_NAMESPACE_VERSION
}
-#endif
-#endif
+#endif // defined(_GLIBCXX_HAVE_LINUX_FUTEX) && ATOMIC_INT_LOCK_FREE > 1
+#endif // _GLIBCXX_HAS_GTHREADS
const char*
future_error::what() const noexcept { return logic_error::what(); }
-#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
+#ifdef _GLIBCXX_HAS_GTHREADS
__future_base::_Result_base::_Result_base() = default;
__future_base::_Result_base::~_Result_base() = default;
_M_cb = &_Make_ready::_S_run;
__at_thread_exit(this);
}
-#endif
+#endif // _GLIBCXX_HAS_GTHREADS
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std
#include <mutex>
-#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
+#ifdef _GLIBCXX_HAS_GTHREADS
#ifndef _GLIBCXX_HAVE_TLS
namespace
{
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std
-#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
+#endif // _GLIBCXX_HAS_GTHREADS
#include <cerrno>
#include <cxxabi_forced.h>
-#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
+#ifdef _GLIBCXX_HAS_GTHREADS
#if defined(_GLIBCXX_USE_GET_NPROCS)
# include <sys/sysinfo.h>
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std
-#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
+#endif // _GLIBCXX_HAS_GTHREADS
// std::numeric_limits<int64_t>::max() == 9223372036854775807;
auto h = 9223372036854775808h;
- // { dg-error "cannot be represented" "" { target *-*-* } 898 }
+ // { dg-error "cannot be represented" "" { target *-*-* } 908 }
}
// { dg-prune-output "in constexpr expansion" } // needed for -O0
test_type d; // { dg-error "required from here" }
}
-// { dg-error "rep cannot be a duration" "" { target *-*-* } 318 }
+// { dg-error "rep cannot be a duration" "" { target *-*-* } 316 }
test_type d; // { dg-error "required from here" }
}
-// { dg-error "must be a specialization of ratio" "" { target *-*-* } 319 }
+// { dg-error "must be a specialization of ratio" "" { target *-*-* } 317 }
// { dg-prune-output "not a member" }
test_type d; // { dg-error "required from here" }
}
-// { dg-error "period must be positive" "" { target *-*-* } 321 }
+// { dg-error "period must be positive" "" { target *-*-* } 319 }
std::ratio<1,0> r1 __attribute__((unused)); // { dg-error "required from here" }
}
-// { dg-error "denominator cannot be zero" "" { target *-*-* } 265 }
-// { dg-error "out of range" "" { target *-*-* } 266 }
-// { dg-error "overflow in constant expression" "" { target *-*-* } 61 }
+// { dg-error "denominator cannot be zero" "" { target *-*-* } 263 }
+// { dg-error "out of range" "" { target *-*-* } 264 }
+// { dg-error "overflow in constant expression" "" { target *-*-* } 59 }
// { dg-prune-output "not a member" }
// { dg-error "required from here" "" { target *-*-* } 28 }
// { dg-error "expected initializer" "" { target *-*-* } 35 }
// { dg-error "expected initializer" "" { target *-*-* } 37 }
-// { dg-error "overflow in addition" "" { target *-*-* } 452 }
+// { dg-error "overflow in addition" "" { target *-*-* } 450 }
+// { dg-error "overflow in multiplication" "" { target *-*-* } 95 }
// { dg-error "overflow in multiplication" "" { target *-*-* } 97 }
// { dg-error "overflow in multiplication" "" { target *-*-* } 99 }
-// { dg-error "overflow in multiplication" "" { target *-*-* } 101 }
-// { dg-error "overflow in constant expression" "" { target *-*-* } 108 }
+// { dg-error "overflow in constant expression" "" { target *-*-* } 106 }
// { dg-prune-output "out of range" }
// { dg-prune-output "not usable in a constant expression" }
projects / gcc.git / commitdiff