Changeset 167544 in webkit

Timestamp:

Apr 19, 2014, 1:36:58 PM (12 years ago)

Author:

fpizlo@apple.com

Message:

Address some feedback on ​https://bugs.webkit.org/show_bug.cgi?id=130684.

• dfg/DFGOperations.cpp:
• runtime/JSString.h:

(JSC::JSRopeString::RopeBuilder::append):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGOperations.cpp (modified) (2 diffs)
• runtime/JSString.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-04-19  Filip Pizlo  <fpizlo@apple.com>
+
+        Address some feedback on https://bugs.webkit.org/show_bug.cgi?id=130684.
+
+        * dfg/DFGOperations.cpp:
+        * runtime/JSString.h:
+        (JSC::JSRopeString::RopeBuilder::append):
+
 2014-04-18  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

@@ -972 +972 @@
     if (static_cast<int32_t>(left->length() + right->length()) < 0) {
         throwOutOfMemoryError(exec);
-        return 0;
+        return nullptr;
     }
 
@@ -988 +988 @@
     if (length.hasOverflowed()) {
         throwOutOfMemoryError(exec);
-        return 0;
+        return nullptr;
     }
 

trunk/Source/JavaScriptCore/runtime/JSString.h

@@ -235 +235 @@
                     expand();
                 if (static_cast<int32_t>(m_jsString->length() + jsString->length()) < 0) {
-                    m_jsString = 0;
+                    m_jsString = nullptr;
                     return false;
                 }