Remove the pointer from StringImpl

Source/core/scripts/StaticString.pm

 # Copyright (C) 2013 Google, 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
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
 # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 # PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
 # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 # PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 # OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package StaticString;
 
 use strict;
 use Hasher;
 
-sub GenerateStrings($)
+sub GenerateStringDecls($)
 {
     my $stringsRef = shift;
     my %strings = %$stringsRef;
 
     my @result = ();
 
     push(@result, "\n");
 
     while ( my ($name, $value) = each %strings ) {
-        push(@result, "static const LChar ${name}String8[] = \"${value}\";\n");
+        my $length = length($value);
+        push(@result, <<END);
+static struct {
+    const char header[sizeof(StringImpl)];
+    const char data[$length + 1];
+} ${name}Data = {
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    "${value}",
+};
+END
     }
 
+    return join "", @result;
+}
+
+sub GenerateStringImpls($)
+{
+    my $stringsRef = shift;
+    my %strings = %$stringsRef;
+
+    my @result = ();
+
     push(@result, "\n");
 
     while ( my ($name, $value) = each %strings ) {
         my $length = length($value);
         my $hash = Hasher::GenerateHashValue($value);
-        push(@result, <<END);
-static StringImpl::StaticASCIILiteral ${name}Data = {
-    ${name}String8,
-    StringImpl::StaticASCIILiteral::s_initialRefCount,
-    $length,
-    StringImpl::StaticASCIILiteral::s_initialFlags | (${hash} << StringImpl::StaticASCIILiteral::s_hashShift)
-};
-END
-    }
-
-    push(@result, "\n");
-
-    while ( my ($name, $value) = each %strings ) {
-        push(@result, "static StringImpl* ${name}Impl = reinterpret_cast<StringImpl*>(&${name}Data);\n");
+        push(@result, "    StringImpl* ${name}Impl = new ((void*)&${name}Data.header) StringImpl($length, $hash, StringImpl::StaticString);\n");
     }
 
     push(@result, "\n");
 
     return join "", @result;
-}
-
-sub GenerateStringAsserts($)
-{
-    my $stringsRef = shift;
-    my %strings = %$stringsRef;
-
-    my @result = ();
-
-    push(@result, "#ifndef NDEBUG\n");
-
-    while ( my ($name, $value) = each %strings ) {
-        push(@result, "    ${name}Impl->assertHashIsCorrect();\n");
-    }
-
-    push(@result, "#endif // NDEBUG\n");
-
-    push(@result, "\n");
-
-    return join "", @result;
 }
 
 1;