Remove the pointer from StringImpl

Source/wtf/text/StringStatics.cpp

 /*
  * Copyright (C) 2010 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 22 matching lines @@
 #include "AtomicString.h"
 #include "StringImpl.h"
 #include "wtf/DynamicAnnotations.h"
 #include "wtf/MainThread.h"
 #include "wtf/StaticConstructors.h"
 
 namespace WTF {
 
 StringImpl* StringImpl::empty()
 {
-    // FIXME: This works around a bug in our port of PCRE, that a regular expression
-    // run on the empty string may still perform a read from the first element, and
-    // as such we need this to be a valid pointer. No code should ever be reading
-    // from a zero length string, so this should be able to be a non-null pointer
-    // into the zero-page.
-    // Replace this with 'reinterpret_cast<UChar*>(static_cast<intptr_t>(1))' once
-    // PCRE goes away.
-    static LChar emptyLCharData = 0;
-    DEFINE_STATIC_LOCAL(StringImpl, emptyString, (&emptyLCharData, 0, ConstructStaticString));
+    DEFINE_STATIC_LOCAL(StringImpl, emptyString, (ConstructEmptyString));
     WTF_ANNOTATE_BENIGN_RACE(&emptyString, "Benign race on StringImpl::emptyString reference counter");
     return &emptyString;
 }
 
 WTF_EXPORT DEFINE_GLOBAL(AtomicString, nullAtom)
 WTF_EXPORT DEFINE_GLOBAL(AtomicString, emptyAtom)
 WTF_EXPORT DEFINE_GLOBAL(AtomicString, textAtom)
 WTF_EXPORT DEFINE_GLOBAL(AtomicString, commentAtom)
 WTF_EXPORT DEFINE_GLOBAL(AtomicString, starAtom)
 WTF_EXPORT DEFINE_GLOBAL(AtomicString, xmlAtom)
 WTF_EXPORT DEFINE_GLOBAL(AtomicString, xmlnsAtom)
 WTF_EXPORT DEFINE_GLOBAL(AtomicString, xlinkAtom)
 
 NEVER_INLINE unsigned StringImpl::hashSlowCase() const
 {
     if (is8Bit())
-        setHash(StringHasher::computeHashAndMaskTop8Bits(m_data8, m_length));
+        setHash(StringHasher::computeHashAndMaskTop8Bits(characters8(), m_length));
     else
-        setHash(StringHasher::computeHashAndMaskTop8Bits(m_data16, m_length));
+        setHash(StringHasher::computeHashAndMaskTop8Bits(characters16(), m_length));
     return existingHash();
 }
 
 void AtomicString::init()
 {
     ASSERT(isMainThread());
 
     new (NotNull, (void*)&nullAtom) AtomicString;
     new (NotNull, (void*)&emptyAtom) AtomicString("");
 }
 
 void StringStatics::init()
 {
     ASSERT(isMainThread());
 
     // FIXME: These should be allocated at compile time.
     new (NotNull, (void*)&textAtom) AtomicString("#text", AtomicString::ConstructFromLiteral);
     new (NotNull, (void*)&commentAtom) AtomicString("#comment", AtomicString::ConstructFromLiteral);
     new (NotNull, (void*)&starAtom) AtomicString("*", AtomicString::ConstructFromLiteral);
     new (NotNull, (void*)&xmlAtom) AtomicString("xml", AtomicString::ConstructFromLiteral);
     new (NotNull, (void*)&xmlnsAtom) AtomicString("xmlns", AtomicString::ConstructFromLiteral);
     new (NotNull, (void*)&xlinkAtom) AtomicString("xlink", AtomicString::ConstructFromLiteral);
 }
 
 }