Changeset 59067 in webkit for trunk/JavaScriptCore

Timestamp:

May 10, 2010, 12:02:34 AM (15 years ago)

Author:

[email protected]

Message:

2010-05-09 Fumitoshi Ukai <​[email protected]>

Reviewed by Eric Seidel.

JavaScriptCore/wtf/MD5.h: checksum should take a reference to output.
​https://bugs.webkit.org/show_bug.cgi?id=38723

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• wtf/MD5.cpp: (WTF::expectMD5): Fix for checksum change. (WTF::MD5::checksum): Take a reference to output, instead of returning the result by value, to reduce coping for performance.
• wtf/MD5.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.exp (modified) (1 diff)
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def (modified) (1 diff)
• wtf/MD5.cpp (modified) (4 diffs)
• wtf/MD5.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-05-09  Fumitoshi Ukai  <[email protected]>
+
+        Reviewed by Eric Seidel.
+
+        JavaScriptCore/wtf/MD5.h: checksum should take a reference to output.
+        https://bugs.webkit.org/show_bug.cgi?id=38723
+
+        * JavaScriptCore.exp:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
+        * wtf/MD5.cpp:
+        (WTF::expectMD5):
+          Fix for checksum change.
+        (WTF::MD5::checksum):
+          Take a reference to output, instead of returning the result by value, to reduce coping for performance.
+        * wtf/MD5.h:
+
 2010-05-09  Oliver Hunt  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.exp

@@ -350 +350 @@
 __ZN3WTF39initializeMainThreadToProcessMainThreadEv
 __ZN3WTF3MD58addBytesEPKhm
-__ZN3WTF3MD58checksumEv
+__ZN3WTF3MD58checksumERNS_6VectorIhLm16EEE
 __ZN3WTF3MD5C1Ev
 __ZN3WTF5Mutex4lockEv

trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def

@@ -90 +90 @@
     ?checkCurrentIdentifierTable@Identifier@JSC@@CAXPAVJSGlobalData@2@@Z
     ?checkSyntax@JSC@@YA?AVCompletion@1@PAVExecState@1@ABVSourceCode@1@@Z
-    ?checksum@MD5@WTF@@QAE?AV?$Vector@E$0BA@@2@XZ
+    ?checksum@MD5@WTF@@QAEXAAV?$Vector@E$0BA@@2@@Z
     ?classInfo@InternalFunction@JSC@@UBEPBUClassInfo@2@XZ
     ?classInfo@JSCell@JSC@@UBEPBUClassInfo@2@XZ

trunk/JavaScriptCore/wtf/MD5.cpp

@@ -68 +68 @@
     MD5 md5;
     md5.addBytes(reinterpret_cast<const uint8_t*>(input.data()), input.length());
-    Vector<uint8_t, 16> digest = md5.checksum();
+    Vector<uint8_t, 16> digest;
+    md5.checksum(digest);
     char* buf = 0;
     CString actual = CString::newUninitialized(32, buf);
@@ -257 +258 @@
 }
 
-Vector<uint8_t, 16> MD5::checksum()
+void MD5::checksum(Vector<uint8_t, 16>& digest)
 {
     // Compute number of bytes mod 64
@@ -292 +293 @@
     MD5Transform(m_buf, reinterpret_cast<uint32_t*>(m_in));
     reverseBytes(reinterpret_cast<uint8_t*>(m_buf), 4);
-    Vector<uint8_t, 16> digest;
+
+    // Now, m_buf contains checksum result.
+    if (!digest.isEmpty())
+        digest.clear();
     digest.append(reinterpret_cast<uint8_t*>(m_buf), 16);
 
@@ -299 +303 @@
     memset(m_bits, 0, sizeof(m_bits));
     memset(m_in, 0, sizeof(m_in));
-    return digest;
 }
 

trunk/JavaScriptCore/wtf/MD5.h

@@ -47 +47 @@
 
     // checksum has a side effect of resetting the state of the object.
-    Vector<uint8_t, 16> checksum();
+    void checksum(Vector<uint8_t, 16>&);
 
 private: