Changeset 49365 in webkit for trunk/JavaScriptCore/runtime/JSString.h

Timestamp:

Oct 8, 2009, 8:22:41 PM (16 years ago)

Author:

[email protected]

Message:

At long last, I pronounce the death of AllInOneFile.cpp.

Patch by Geoffrey Garen <​[email protected]> on 2009-10-08
Reviewed by Maciej Stachowiak.

SunSpider reports a 1.01x speedup.

• AllInOneFile.cpp: Removed.
• GNUmakefile.am:
• JavaScriptCore.exp:
• JavaScriptCore.gypi:
• JavaScriptCore.xcodeproj/project.pbxproj: Added missing project files

to compilation stages.

• parser/Grammar.y:
• parser/Lexer.cpp:
• parser/Lexer.h:

(JSC::jscyylex):

• runtime/ArrayConstructor.cpp:

(JSC::constructArrayWithSizeQuirk):

• runtime/Collector.h:
• runtime/JSCell.cpp:

(JSC::JSCell::operator new):

• runtime/JSCell.h:

(JSC::JSCell::operator new):

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::operator new):

• runtime/JSNumberCell.h:

(JSC::JSNumberCell::operator new):

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

(JSC::jsString):
(JSC::jsSubstring):
(JSC::jsOwnedString):

• runtime/RegExpConstructor.cpp:
• runtime/RegExpConstructor.h:

(JSC::RegExpConstructorPrivate::RegExpConstructorPrivate):
(JSC::RegExpConstructorPrivate::lastOvector):
(JSC::RegExpConstructorPrivate::tempOvector):
(JSC::RegExpConstructorPrivate::changeLastOvector):
(JSC::RegExpConstructor::performMatch):

• runtime/StringPrototype.cpp:

(JSC::stringProtoFuncMatch):

• yarr/RegexJIT.cpp:
• yarr/RegexJIT.h:

(JSC::Yarr::executeRegex): Inlined a few things that Shark said
were hot, on the presumption that AllInOneFile.cpp used to inline them
automatically.

File:

• trunk/JavaScriptCore/runtime/JSString.h (modified) (1 diff)

trunk/JavaScriptCore/runtime/JSString.h

@@ -168 +168 @@
         ASSERT(canGetIndex(i));
         return jsSingleCharacterSubstring(globalData, m_value, i);
+    }
+
+    inline JSString* jsString(JSGlobalData* globalData, const UString& s)
+    {
+        int size = s.size();
+        if (!size)
+            return globalData->smallStrings.emptyString(globalData);
+        if (size == 1) {
+            UChar c = s.data()[0];
+            if (c <= 0xFF)
+                return globalData->smallStrings.singleCharacterString(globalData, c);
+        }
+        return new (globalData) JSString(globalData, s);
+    }
+        
+    inline JSString* jsSubstring(JSGlobalData* globalData, const UString& s, unsigned offset, unsigned length)
+    {
+        ASSERT(offset <= static_cast<unsigned>(s.size()));
+        ASSERT(length <= static_cast<unsigned>(s.size()));
+        ASSERT(offset + length <= static_cast<unsigned>(s.size()));
+        if (!length)
+            return globalData->smallStrings.emptyString(globalData);
+        if (length == 1) {
+            UChar c = s.data()[offset];
+            if (c <= 0xFF)
+                return globalData->smallStrings.singleCharacterString(globalData, c);
+        }
+        return new (globalData) JSString(globalData, UString::Rep::create(s.rep(), offset, length));
+    }
+
+    inline JSString* jsOwnedString(JSGlobalData* globalData, const UString& s)
+    {
+        int size = s.size();
+        if (!size)
+            return globalData->smallStrings.emptyString(globalData);
+        if (size == 1) {
+            UChar c = s.data()[0];
+            if (c <= 0xFF)
+                return globalData->smallStrings.singleCharacterString(globalData, c);
+        }
+        return new (globalData) JSString(globalData, s, JSString::HasOtherOwner);
     }