Changeset 178756 in webkit for trunk/Source/JavaScriptCore/runtime/PropertyName.h

Timestamp:

Jan 20, 2015, 2:43:06 PM (10 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r178751.
​https://bugs.webkit.org/show_bug.cgi?id=140694

Caused 32-bit JSC test failures (Requested by JoePeck on
#webkit).

Reverted changeset:

"put_by_val_direct need to check the property is index or not
for using putDirect / putDirectIndex"
​https://bugs.webkit.org/show_bug.cgi?id=140426
​http://trac.webkit.org/changeset/178751

File:

• trunk/Source/JavaScriptCore/runtime/PropertyName.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/PropertyName.h

@@ -29 +29 @@
 #include "Identifier.h"
 #include "PrivateName.h"
-#include <wtf/Optional.h>
 
 namespace JSC {
 
 template <typename CharType>
-ALWAYS_INLINE Optional<uint32_t> toUInt32FromCharacters(const CharType* characters, unsigned length)
+ALWAYS_INLINE uint32_t toUInt32FromCharacters(const CharType* characters, unsigned length)
 {
     // An empty string is not a number.
     if (!length)
-        return Nullopt;
+        return UINT_MAX;
 
     // Get the first character, turning it into a digit.
     uint32_t value = characters[0] - '0';
     if (value > 9)
-        return Nullopt;
+        return UINT_MAX;
     
     // Check for leading zeros. If the first characher is 0, then the
     // length of the string must be one - e.g. "042" is not equal to "42".
     if (!value && length > 1)
-        return Nullopt;
+        return UINT_MAX;
     
     while (--length) {
         // Multiply value by 10, checking for overflow out of 32 bits.
         if (value > 0xFFFFFFFFU / 10)
-            return Nullopt;
+            return UINT_MAX;
         value *= 10;
         
@@ -59 +58 @@
         uint32_t newValue = *(++characters) - '0';
         if (newValue > 9)
-            return Nullopt;
+            return UINT_MAX;
         
         // Add in the old value, checking for overflow out of 32 bits.
         newValue += value;
         if (newValue < value)
-            return Nullopt;
+            return UINT_MAX;
         value = newValue;
     }
-
-    if (value == UINT_MAX)
-        return Nullopt;
+    
     return value;
 }
 
-ALWAYS_INLINE Optional<uint32_t> toUInt32FromStringImpl(StringImpl* impl)
+ALWAYS_INLINE uint32_t toUInt32FromStringImpl(StringImpl* impl)
 {
     if (impl->is8Bit())
@@ -113 +110 @@
     static const uint32_t NotAnIndex = UINT_MAX;
 
-    Optional<uint32_t> asIndex()
+    uint32_t asIndex()
     {
-        return m_impl ? toUInt32FromStringImpl(m_impl) : Nullopt;
+        return m_impl ? toUInt32FromStringImpl(m_impl) : NotAnIndex;
     }
-
+    
     void dump(PrintStream& out) const
     {