Changeset 59170 in webkit for trunk/JavaScriptCore

Timestamp:

May 11, 2010, 1:38:13 PM (15 years ago)

Author:

[email protected]

Message:

Fixed test failures seen on SnowLeopard buildbot.

• runtime/JSString.cpp:

(JSC::JSString::replaceCharacter): Don't use size_t and wtf::notFound.
Instead, use the individual types and notFound values of the string APIs
we're using, since they're not necessarily the same in 64bit.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSString.cpp (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-05-11  Geoffrey Garen  <[email protected]>
+
+        Fixed test failures seen on SnowLeopard buildbot.
+
+        * runtime/JSString.cpp:
+        (JSC::JSString::replaceCharacter): Don't use size_t and wtf::notFound.
+        Instead, use the individual types and notFound values of the string APIs
+        we're using, since they're not necessarily the same in 64bit.
+
 2010-05-11  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/runtime/JSString.cpp

@@ -108 +108 @@
 {
     if (!isRope()) {
-        size_t matchPosition = m_value.find(character);
-        if (matchPosition == notFound)
+        unsigned matchPosition = m_value.find(character);
+        if (matchPosition == UString::NotFound)
             return JSValue(this);
         return jsString(exec, m_value.substr(0, matchPosition), replacement, m_value.substr(matchPosition + 1));
@@ -119 +119 @@
     size_t fiberCount = 0;
     UStringImpl* matchString = 0;
-    size_t matchPosition = notFound;
+    int matchPosition = -1;
     for (RopeIterator it(m_other.m_fibers, m_fiberCount); it != end; ++it) {
         ++fiberCount;
@@ -127 +127 @@
         UStringImpl* string = *it;
         matchPosition = string->find(character);
-        if (matchPosition == notFound)
+        if (matchPosition == -1)
             continue;
         matchString = string;