Changeset 35177 in webkit

Timestamp:

Jul 14, 2008 7:17:56 PM (16 years ago)

Author:

mrowe@apple.com

Message:

Fix ​https://bugs.webkit.org/show_bug.cgi?id=20037
Bug 20037: GCC 4.2 build broken due to strict aliasing violation.

Reviewed by Sam Weinig.

• kjs/ustring.cpp:

(KJS::UString::Rep::computeHash): Add a version of computeHash that takes a char* and explicit length.

• kjs/ustring.h:
• profiler/CallIdentifier.h:

(WTF::): Use new version of computeHash that takes a char* and explicit length to avoid unsafe aliasing.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/ustring.cpp (modified) (2 diffs)
• kjs/ustring.h (modified) (2 diffs)
• profiler/CallIdentifier.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-07-14  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Fix https://bugs.webkit.org/show_bug.cgi?id=20037
+        Bug 20037: GCC 4.2 build broken due to strict aliasing violation.
+
+        * kjs/ustring.cpp:
+        (KJS::UString::Rep::computeHash): Add a version of computeHash that takes a char* and explicit length.
+        * kjs/ustring.h:
+        * profiler/CallIdentifier.h:
+        (WTF::): Use new version of computeHash that takes a char* and explicit length to avoid unsafe aliasing.
+
 2008-07-14  David Hyatt  <hyatt@apple.com>
 

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -314 +314 @@
 // Paul Hsieh's SuperFastHash
 // http://www.azillionmonkeys.com/qed/hash.html
-unsigned UString::Rep::computeHash(const char* s)
+unsigned UString::Rep::computeHash(const char* s, int l)
 {
     // This hash is designed to work on 16-bit chunks at a time. But since the normal case
@@ -322 +322 @@
     uint32_t hash = PHI;
     uint32_t tmp;
-    size_t l = strlen(s);
 
     size_t rem = l & 1;

trunk/JavaScriptCore/kjs/ustring.h

@@ -25 +25 @@
 #include "collector.h"
 #include <stdint.h>
+#include <string.h>
 #include <wtf/Assertions.h>
 #include <wtf/FastMalloc.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
+#include <wtf/Vector.h>
 #include <wtf/unicode/Unicode.h>
-#include <wtf/Vector.h>
 
 namespace KJS {
@@ -93 +94 @@
 
             static unsigned computeHash(const UChar*, int length);
-            static unsigned computeHash(const char*);
+            static unsigned computeHash(const char*, int length);
+            static unsigned computeHash(const char* s) { return computeHash(s, strlen(s)); }
 
             Rep* ref() { ++rc; return this; }

trunk/JavaScriptCore/profiler/CallIdentifier.h

@@ -71 +71 @@
                 key.m_lineNumber
             };
-            return KJS::UString::Rep::computeHash(reinterpret_cast<UChar*>(hashCodes), sizeof(hashCodes) / sizeof(UChar));
+            return KJS::UString::Rep::computeHash(reinterpret_cast<char*>(hashCodes), sizeof(hashCodes));
         }