Enable ThreadRestrictionVerifier for StringImpl

third_party/WebKit/Source/wtf/text/StringImpl.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller ( mueller@kde.org )
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2013 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 14 matching lines @@
 
 #include "wtf/text/StringImpl.h"
 
 #include "wtf/DynamicAnnotations.h"
 #include "wtf/LeakAnnotations.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/allocator/Partitions.h"
 #include "wtf/text/AtomicString.h"
 #include "wtf/text/AtomicStringTable.h"
+#include "wtf/text/CString.h"
 #include "wtf/text/CharacterNames.h"
 #include "wtf/text/StringBuffer.h"
 #include "wtf/text/StringHash.h"
 #include "wtf/text/StringToNumber.h"
 #include <algorithm>
 #include <memory>
 
 #ifdef STRING_STATS
 #include "wtf/DataLog.h"
 #include "wtf/HashMap.h"
 #include "wtf/HashSet.h"
 #include "wtf/RefCounted.h"
 #include "wtf/ThreadingPrimitives.h"
 #include <unistd.h>
 #endif
 
 using namespace std;
 
 namespace WTF {
 
 using namespace Unicode;
 
+#if !DCHECK_IS_ON()
 static_assert(sizeof(StringImpl) == 3 * sizeof(int),
               "StringImpl should stay small");
+#endif
 
 #ifdef STRING_STATS
 
 static Mutex& statsMutex() {
   DEFINE_STATIC_LOCAL(Mutex, mutex, ());
   return mutex;
 }
 
 static HashSet<void*>& liveStrings() {
   // Notice that we can't use HashSet<StringImpl*> because then HashSet would
@@ skipping 248 matching lines @@
     return true;
   // AtomicStrings are not safe to send between threads as ~StringImpl()
   // will try to remove them from the wrong AtomicStringTable.
   if (isAtomic())
     return false;
   if (hasOneRef())
     return true;
   return false;
 }
 
+#if DCHECK_IS_ON()
+std::string StringImpl::asciiForDebugging() const {
+  CString ascii = String(this->isolatedCopy()).left(128).ascii();

[esprehn, 2017/01/12 23:00:00]

just use substring, that's all left() does anyway:

String(substring(0, 128)).ascii()

no need to copy.

[Charlie Harrison, 2017/01/13 17:42:25]

substring is not const because it can ref |this| (afaict). We need const
correctness here. I think the isolated copy isn't a big deal because we only do
this when we crash.

+  return std::string(ascii.data(), ascii.length());
+}
+#endif
+
 PassRefPtr<StringImpl> StringImpl::createUninitialized(unsigned length,
                                                        LChar*& data) {
   if (!length) {
     data = 0;
     return empty();
   }
 
   // Allocate a single buffer large enough to contain the StringImpl
   // struct as well as the data which it contains. This removes one
   // heap allocation from this call.
@@ skipping 1840 matching lines @@
     } else if (localeIdMatchesLang(localeIdentifier, "lt")) {
       // TODO(rob.buis) implement upper-casing rules for lt
       // like in StringImpl::upper(locale).
     }
   }
 
   return toUpper(c);
 }
 
 }  // namespace WTF