From 09ce329898bd8586066918f796141eb18c1dc93f Mon Sep 17 00:00:00 2001 From: Masatoshi Kimura Date: Thu, 19 Mar 2020 01:10:47 +0000 Subject: [PATCH] Bug 1622688 - Un-#ifdef to enable std::is_trivially_constructible everywhere. r=jwalden Differential Revision: https://phabricator.services.mozilla.com/D66913 --HG-- extra : moz-landing-system : lando --- js/src/gc/Statistics.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/js/src/gc/Statistics.cpp b/js/src/gc/Statistics.cpp index ff279735550c..5bcf15058807 100644 --- a/js/src/gc/Statistics.cpp +++ b/js/src/gc/Statistics.cpp @@ -787,20 +787,12 @@ Statistics::Statistics(GCRuntime* gc) #ifdef DEBUG for (const auto& duration : totalTimes_) { -# if defined(XP_WIN) || defined(XP_MACOSX) || \ - (defined(XP_UNIX) && !defined(__clang__)) - // build-linux64-asan/debug and static-analysis-linux64-st-an/debug - // currently use an STL that lacks std::is_trivially_constructible. - // This #ifdef probably isn't as precise as it could be, but given - // |totalTimes_| contains |TimeDuration| defined platform-independently - // it's not worth the trouble to nail down a more exact condition. using ElementType = typename mozilla::RemoveReference::Type; static_assert(!std::is_trivially_constructible::value, "Statistics::Statistics will only initialize " "totalTimes_'s elements if their default constructor is " "non-trivial"); -# endif // mess'o'tests MOZ_ASSERT(duration.IsZero(), "totalTimes_ default-initialization should have " "default-initialized every element of totalTimes_ to zero");