Changeset 57912 in webkit for trunk/JavaScriptCore

Timestamp:

Apr 20, 2010, 1:33:56 PM (15 years ago)

Author:

[email protected]

Message:

JavaScriptCore: Add missing .def file entries.

Reviewed by NOBODY (windows build fix).

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:

WebCore: Speculative tiger build fix.

Reviewed by NOBODY (build fix).

• WebCore.NPAPI.exp:
• WebCore.PluginHostProcess.exp:
• WebCore.base.exp:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (1 diff)
• JavaScriptCore.pro (modified) (1 diff)
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• runtime/JSString.cpp (modified) (3 diffs)
• runtime/JSString.h (modified) (10 diffs)
• runtime/RopeImpl.cpp (copied) (copied from trunk/JavaScriptCore/runtime/UStringImpl.cpp ) (3 diffs)
• runtime/RopeImpl.h (copied) (copied from trunk/JavaScriptCore/runtime/UStringImpl.h ) (4 diffs)
• runtime/UStringImpl.cpp (modified) (1 diff)
• runtime/UStringImpl.h (modified) (10 diffs)

trunk/JavaScriptCore/ChangeLog

@@ -6 +6 @@
 
         * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
+
+2010-04-20  Gavin Barraclough  <[email protected]>
+
+        Reviewed by Geoff Garen.
+
+        Bug 37869 - Move URopeImpl to its own .h/.cpp
+        
+        Currently Ropes are implemented by the class URopeImpl, which is defined in
+        UStringImpl.h, and then typedefed to the name JSString::Rope. Remove the
+        typedef, and rename all uses of URopeImpl and JSString::Rope to just RopeImpl.
+
+        Move RopeImpl to its own header, and remove all remaining references to ropes
+        from UStringImpl (rename UStringOrRopeImpl to UStringImplBase, rename or move
+        the isRope & deref methods from UStringOrRopeImpl).
+
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * runtime/JSString.cpp:
+        (JSC::JSString::resolveRope):
+        * runtime/JSString.h:
+        (JSC::):
+        (JSC::RopeBuilder::JSString):
+        (JSC::RopeBuilder::~JSString):
+        (JSC::RopeBuilder::appendStringInConstruct):
+        (JSC::RopeBuilder::JSStringFinalizerStruct::):
+        * runtime/RopeImpl.cpp: Copied from JavaScriptCore/runtime/UStringImpl.cpp.
+        (JSC::RopeImpl::derefFibersNonRecursive):
+        (JSC::RopeImpl::destructNonRecursive):
+        * runtime/RopeImpl.h: Copied from JavaScriptCore/runtime/UStringImpl.h.
+        (JSC::RopeImpl::tryCreateUninitialized):
+        (JSC::RopeImpl::isRope):
+        (JSC::RopeImpl::deref):
+        (JSC::RopeImpl::RopeImpl):
+        * runtime/UStringImpl.cpp:
+        * runtime/UStringImpl.h:
+        (JSC::UStringImplBase::isInvalid):
+        (JSC::UStringImplBase::ref):
+        (JSC::UStringImplBase::UStringImplBase):
+        (JSC::UStringImplBase::):
+        (JSC::UStringImpl::UStringImpl):
 
 2010-04-20  Gavin Barraclough  <[email protected]>

trunk/JavaScriptCore/GNUmakefile.am

@@ -499 +499 @@
         JavaScriptCore/runtime/RegExpPrototype.cpp \
         JavaScriptCore/runtime/RegExpPrototype.h \
+        JavaScriptCore/runtime/RopeImpl.cpp \
+        JavaScriptCore/runtime/RopeImpl.h \
         JavaScriptCore/runtime/ScopeChain.cpp \
         JavaScriptCore/runtime/ScopeChain.h \

trunk/JavaScriptCore/JavaScriptCore.pro

@@ -178 +178 @@
     runtime/RegExpObject.cpp \
     runtime/RegExpPrototype.cpp \
+    runtime/RopeImpl.cpp \
     runtime/ScopeChain.cpp \
     runtime/SmallStrings.cpp \

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

@@ -1139 +1139 @@
                         <File
                                 RelativePath="..\..\runtime\RegExpPrototype.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\runtime\RopeImpl.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\runtime\RopeImpl.h"
                                 >
                         </File>

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -215 +215 @@
                 86ADD1450FDDEA980006EEC2 /* ARMv7Assembler.h in Headers */ = {isa = PBXBuildFile; fileRef = 86ADD1430FDDEA980006EEC2 /* ARMv7Assembler.h */; };
                 86ADD1460FDDEA980006EEC2 /* MacroAssemblerARMv7.h in Headers */ = {isa = PBXBuildFile; fileRef = 86ADD1440FDDEA980006EEC2 /* MacroAssemblerARMv7.h */; };
+                86B99AB8117E391E00DF5A90 /* RopeImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86B99AB6117E391E00DF5A90 /* RopeImpl.cpp */; };
+                86B99AB9117E391E00DF5A90 /* RopeImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 86B99AB7117E391E00DF5A90 /* RopeImpl.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 86C36EEA0EE1289D00B3DF59 /* MacroAssembler.h in Headers */ = {isa = PBXBuildFile; fileRef = 86C36EE90EE1289D00B3DF59 /* MacroAssembler.h */; };
                 86CA032E1038E8440028A609 /* Executable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86CA032D1038E8440028A609 /* Executable.cpp */; };
@@ -754 +756 @@
                 86ADD1430FDDEA980006EEC2 /* ARMv7Assembler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARMv7Assembler.h; sourceTree = "<group>"; };
                 86ADD1440FDDEA980006EEC2 /* MacroAssemblerARMv7.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacroAssemblerARMv7.h; sourceTree = "<group>"; };
+                86B99AB6117E391E00DF5A90 /* RopeImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RopeImpl.cpp; sourceTree = "<group>"; };
+                86B99AB7117E391E00DF5A90 /* RopeImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RopeImpl.h; sourceTree = "<group>"; };
                 86C36EE90EE1289D00B3DF59 /* MacroAssembler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacroAssembler.h; sourceTree = "<group>"; };
                 86CA032D1038E8440028A609 /* Executable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Executable.cpp; sourceTree = "<group>"; };
@@ -1625 +1629 @@
                                 BCD202BF0E1706A7002C7E82 /* RegExpPrototype.cpp */,
                                 BCD202C00E1706A7002C7E82 /* RegExpPrototype.h */,
+                                86B99AB6117E391E00DF5A90 /* RopeImpl.cpp */,
+                                86B99AB7117E391E00DF5A90 /* RopeImpl.h */,
                                 9374D3A8038D9D74008635CE /* ScopeChain.cpp */,
                                 9374D3A7038D9D74008635CE /* ScopeChain.h */,
@@ -2074 +2080 @@
                                 868BFA18117CF19900B908B1 /* WTFString.h in Headers */,
                                 868BFA60117D048200B908B1 /* StaticConstructors.h in Headers */,
+                                86B99AB9117E391E00DF5A90 /* RopeImpl.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -2521 +2528 @@
                                 868BFA0E117CEFD100B908B1 /* StringImpl.cpp in Sources */,
                                 868BFA17117CF19900B908B1 /* WTFString.cpp in Sources */,
+                                86B99AB8117E391E00DF5A90 /* RopeImpl.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/JavaScriptCore/runtime/JSString.cpp

@@ -52 +52 @@
     else {
         for (unsigned i = 0; i < m_fiberCount; ++i) {
-            m_other.m_fibers[i]->deref();
+            RopeImpl::deref(m_other.m_fibers[i]);
             m_other.m_fibers[i] = 0;
         }
@@ -63 +63 @@
     UChar* position = buffer + m_length;
 
-    // Start with the current Rope.
-    Vector<Rope::Fiber, 32> workQueue;
-    Rope::Fiber currentFiber;
+    // Start with the current RopeImpl.
+    Vector<RopeImpl::Fiber, 32> workQueue;
+    RopeImpl::Fiber currentFiber;
     for (unsigned i = 0; i < (m_fiberCount - 1); ++i)
         workQueue.append(m_other.m_fibers[i]);
     currentFiber = m_other.m_fibers[m_fiberCount - 1];
     while (true) {
-        if (currentFiber->isRope()) {
-            Rope* rope = static_cast<URopeImpl*>(currentFiber);
+        if (RopeImpl::isRope(currentFiber)) {
+            RopeImpl* rope = static_cast<RopeImpl*>(currentFiber);
             // Copy the contents of the current rope into the workQueue, with the last item in 'currentFiber'
             // (we will be working backwards over the rope).
@@ -89 +89 @@
                 ASSERT(buffer == position);
                 for (unsigned i = 0; i < m_fiberCount; ++i) {
-                    m_other.m_fibers[i]->deref();
+                    RopeImpl::deref(m_other.m_fibers[i]);
                     m_other.m_fibers[i] = 0;
                 }

trunk/JavaScriptCore/runtime/JSString.h

@@ -30 +30 @@
 #include "PropertyDescriptor.h"
 #include "PropertySlot.h"
+#include "RopeImpl.h"
 
 namespace JSC {
@@ -67 +68 @@
         friend class JSGlobalData;
 
-        typedef URopeImpl Rope;
-
         class RopeBuilder {
         public:
             RopeBuilder(unsigned fiberCount)
                 : m_index(0)
-                , m_rope(Rope::tryCreateUninitialized(fiberCount))
+                , m_rope(RopeImpl::tryCreateUninitialized(fiberCount))
             {
             }
@@ -79 +78 @@
             bool isOutOfMemory() { return !m_rope; }
 
-            void append(Rope::Fiber& fiber)
+            void append(RopeImpl::Fiber& fiber)
             {
                 ASSERT(m_rope);
@@ -98 +97 @@
             }
 
-            PassRefPtr<Rope> release()
+            PassRefPtr<RopeImpl> release()
             {
                 ASSERT(m_index == m_rope->fiberCount());
@@ -108 +107 @@
         private:
             unsigned m_index;
-            RefPtr<Rope> m_rope;
+            RefPtr<RopeImpl> m_rope;
         };
 
@@ -138 +137 @@
             ASSERT(!m_value.isNull());
         }
-        JSString(JSGlobalData* globalData, PassRefPtr<Rope> rope)
+        JSString(JSGlobalData* globalData, PassRefPtr<RopeImpl> rope)
             : JSCell(globalData->stringStructure.get())
             , m_length(rope->length())
@@ -217 +216 @@
             ASSERT(vptr() == JSGlobalData::jsStringVPtr);
             for (unsigned i = 0; i < m_fiberCount; ++i)
-                m_other.m_fibers[i]->deref();
+                RopeImpl::deref(m_other.m_fibers[i]);
 
             if (!m_fiberCount && m_other.m_finalizerCallback)
@@ -269 +268 @@
             if (jsString->isRope()) {
                 for (unsigned i = 0; i < jsString->m_fiberCount; ++i) {
-                    Rope::Fiber fiber = jsString->m_other.m_fibers[i];
+                    RopeImpl::Fiber fiber = jsString->m_other.m_fibers[i];
                     fiber->ref();
                     m_other.m_fibers[index++] = fiber;
@@ -310 +309 @@
         static const unsigned s_maxInternalRopeLength = 3;
 
-        // A string is represented either by a UString or a Rope.
+        // A string is represented either by a UString or a RopeImpl.
         unsigned m_length;
         mutable UString m_value;
@@ -318 +317 @@
             JSStringFinalizerStruct() : m_finalizerCallback(0) {}
             union {
-                mutable Rope::Fiber m_fibers[s_maxInternalRopeLength];
+                mutable RopeImpl::Fiber m_fibers[s_maxInternalRopeLength];
                 struct {
                     JSStringFinalizerCallback m_finalizerCallback;

trunk/JavaScriptCore/runtime/RopeImpl.cpp

@@ -25 +25 @@
 
 #include "config.h"
-#include "UStringImpl.h"
-
-#include "Identifier.h"
-#include "StdLibExtras.h"
-#include "UString.h"
-#include <wtf/unicode/UTF8.h>
-
-using namespace WTF::Unicode;
-using namespace std;
+#include "RopeImpl.h"
 
 namespace JSC {
 
-static const unsigned minLengthToShare = 20;
-
-UStringImpl::~UStringImpl()
-{
-    ASSERT(!isStatic());
-
-    if (isIdentifier())
-        Identifier::remove(this);
-
-    BufferOwnership ownership = bufferOwnership();
-    if (ownership != BufferInternal) {
-        if (ownership == BufferOwned) {
-            ASSERT(!m_sharedBuffer);
-            ASSERT(m_data);
-            fastFree(const_cast<UChar*>(m_data));
-        } else if (ownership == BufferSubstring) {
-            ASSERT(m_substringBuffer);
-            m_substringBuffer->deref();
-        } else {
-            ASSERT(ownership == BufferShared);
-            ASSERT(m_sharedBuffer);
-            m_sharedBuffer->deref();
-        }
-    }
-}
-
-UStringImpl* UStringImpl::empty()
-{
-    // FIXME: This works around a bug in our port of PCRE, that a regular expression
-    // run on the empty string may still perform a read from the first element, and
-    // as such we need this to be a valid pointer. No code should ever be reading
-    // from a zero length string, so this should be able to be a non-null pointer
-    // into the zero-page.
-    // Replace this with 'reinterpret_cast<UChar*>(static_cast<intptr_t>(1))' once
-    // PCRE goes away.
-    static UChar emptyUCharData = 0;
-    DEFINE_STATIC_LOCAL(UStringImpl, emptyString, (&emptyUCharData, 0, ConstructStaticString));
-    return &emptyString;
-}
-
-PassRefPtr<UStringImpl> UStringImpl::createUninitialized(unsigned length, UChar*& data)
-{
-    if (!length) {
-        data = 0;
-        return empty();
-    }
-
-    // Allocate a single buffer large enough to contain the StringImpl
-    // struct as well as the data which it contains. This removes one 
-    // heap allocation from this call.
-    if (length > ((std::numeric_limits<size_t>::max() - sizeof(UStringImpl)) / sizeof(UChar)))
-        CRASH();
-    size_t size = sizeof(UStringImpl) + length * sizeof(UChar);
-    UStringImpl* string = static_cast<UStringImpl*>(fastMalloc(size));
-
-    data = reinterpret_cast<UChar*>(string + 1);
-    return adoptRef(new (string) UStringImpl(length));
-}
-
-PassRefPtr<UStringImpl> UStringImpl::create(const UChar* characters, unsigned length)
-{
-    if (!characters || !length)
-        return empty();
-
-    UChar* data;
-    PassRefPtr<UStringImpl> string = createUninitialized(length, data);
-    memcpy(data, characters, length * sizeof(UChar));
-    return string;
-}
-
-PassRefPtr<UStringImpl> UStringImpl::create(const char* characters, unsigned length)
-{
-    if (!characters || !length)
-        return empty();
-
-    UChar* data;
-    PassRefPtr<UStringImpl> string = createUninitialized(length, data);
-    for (unsigned i = 0; i != length; ++i) {
-        unsigned char c = characters[i];
-        data[i] = c;
-    }
-    return string;
-}
-
-PassRefPtr<UStringImpl> UStringImpl::create(const char* string)
-{
-    if (!string)
-        return empty();
-    return create(string, strlen(string));
-}
-
-PassRefPtr<UStringImpl> UStringImpl::create(const UChar* buffer, unsigned length, PassRefPtr<SharedUChar> sharedBuffer)
-{
-    if (!length)
-        return empty();
-    return adoptRef(new UStringImpl(buffer, length, sharedBuffer));
-}
-
-SharedUChar* UStringImpl::sharedBuffer()
-{
-    if (m_length < minLengthToShare)
-        return 0;
-    // All static strings are smaller that the minimim length to share.
-    ASSERT(!isStatic());
-
-    BufferOwnership ownership = bufferOwnership();
-
-    if (ownership == BufferInternal)
-        return 0;
-    if (ownership == BufferSubstring)
-        return m_substringBuffer->sharedBuffer();
-    if (ownership == BufferOwned) {
-        ASSERT(!m_sharedBuffer);
-        m_sharedBuffer = SharedUChar::create(new SharableUChar(m_data)).releaseRef();
-        m_refCountAndFlags = (m_refCountAndFlags & ~s_refCountMaskBufferOwnership) | BufferShared;
-    }
-
-    ASSERT(bufferOwnership() == BufferShared);
-    ASSERT(m_sharedBuffer);
-    return m_sharedBuffer;
-}
-
-void URopeImpl::derefFibersNonRecursive(Vector<URopeImpl*, 32>& workQueue)
+void RopeImpl::derefFibersNonRecursive(Vector<RopeImpl*, 32>& workQueue)
 {
     unsigned length = fiberCount();
     for (unsigned i = 0; i < length; ++i) {
         Fiber& fiber = fibers(i);
-        if (fiber->isRope()) {
-            URopeImpl* nextRope = static_cast<URopeImpl*>(fiber);
+        if (isRope(fiber)) {
+            RopeImpl* nextRope = static_cast<RopeImpl*>(fiber);
             if (nextRope->hasOneRef())
                 workQueue.append(nextRope);
@@ -175 +45 @@
 }
 
-void URopeImpl::destructNonRecursive()
+void RopeImpl::destructNonRecursive()
 {
-    Vector<URopeImpl*, 32> workQueue;
+    Vector<RopeImpl*, 32> workQueue;
 
     derefFibersNonRecursive(workQueue);
@@ -183 +53 @@
 
     while (!workQueue.isEmpty()) {
-        URopeImpl* rope = workQueue.last();
+        RopeImpl* rope = workQueue.last();
         workQueue.removeLast();
         rope->derefFibersNonRecursive(workQueue);

trunk/JavaScriptCore/runtime/RopeImpl.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-#ifndef UStringImpl_h
-#define UStringImpl_h
+#ifndef RopeImpl_h
+#define RopeImpl_h
 
-#include <limits>
-#include <wtf/CrossThreadRefCounted.h>
-#include <wtf/OwnFastMallocPtr.h>
-#include <wtf/PossiblyNull.h>
-#include <wtf/StringHashFunctions.h>
-#include <wtf/Vector.h>
-#include <wtf/unicode/Unicode.h>
+#include "UStringImpl.h"
 
 namespace JSC {
 
-class IdentifierTable;
+class RopeImpl : public UStringImplBase {
+public:
+    // A RopeImpl is composed from a set of smaller strings called Fibers.
+    // Each Fiber in a rope is either UStringImpl or another RopeImpl.
+    typedef UStringImplBase* Fiber;
 
-typedef OwnFastMallocPtr<const UChar> SharableUChar;
-typedef CrossThreadRefCounted<SharableUChar> SharedUChar;
-
-class UStringOrRopeImpl : public Noncopyable {
-public:
-    bool isRope() { return (m_refCountAndFlags & s_refCountIsRope) == s_refCountIsRope; }
-    unsigned length() const { return m_length; }
-
-    void ref() { m_refCountAndFlags += s_refCountIncrement; }
-    inline void deref();
-
-protected:
-    enum BufferOwnership {
-        BufferInternal,
-        BufferOwned,
-        BufferSubstring,
-        BufferShared,
-    };
-
-    using Noncopyable::operator new;
-    void* operator new(size_t, void* inPlace) { return inPlace; }
-
-    // For SmallStringStorage, which allocates an array and uses an in-place new.
-    UStringOrRopeImpl() { }
-
-    UStringOrRopeImpl(unsigned length, BufferOwnership ownership)
-        : m_refCountAndFlags(s_refCountIncrement | s_refCountFlagShouldReportedCost | ownership)
-        , m_length(length)
-    {
-        ASSERT(!isRope());
-    }
-
-    enum StaticStringConstructType { ConstructStaticString };
-    UStringOrRopeImpl(unsigned length, StaticStringConstructType)
-        : m_refCountAndFlags(s_refCountFlagStatic | s_refCountFlagIsIdentifier | BufferOwned)
-        , m_length(length)
-    {
-        ASSERT(!isRope());
-    }
-
-    enum RopeConstructType { ConstructRope };
-    UStringOrRopeImpl(RopeConstructType)
-        : m_refCountAndFlags(s_refCountIncrement | s_refCountIsRope)
-        , m_length(0)
-    {
-        ASSERT(isRope());
-    }
-
-    // The bottom 5 bits hold flags, the top 27 bits hold the ref count.
-    // When dereferencing UStringImpls we check for the ref count AND the
-    // static bit both being zero - static strings are never deleted.
-    static const unsigned s_refCountMask = 0xFFFFFFE0;
-    static const unsigned s_refCountIncrement = 0x20;
-    static const unsigned s_refCountFlagStatic = 0x10;
-    static const unsigned s_refCountFlagShouldReportedCost = 0x8;
-    static const unsigned s_refCountFlagIsIdentifier = 0x4;
-    static const unsigned s_refCountMaskBufferOwnership = 0x3;
-    // Use an otherwise invalid permutation of flags (static & shouldReportedCost -
-    // static strings do not set shouldReportedCost in the constructor, and this bit
-    // is only ever cleared, not set) to identify objects that are ropes.
-    static const unsigned s_refCountIsRope = s_refCountFlagStatic | s_refCountFlagShouldReportedCost;
-
-    unsigned m_refCountAndFlags;
-    unsigned m_length;
-};
-
-class UStringImpl : public UStringOrRopeImpl {
-    friend struct CStringTranslator;
-    friend struct UCharBufferTranslator;
-    friend class JIT;
-    friend class SmallStringsStorage;
-    friend class UStringOrRopeImpl;
-    friend void initializeUString();
-private:
-    // For SmallStringStorage, which allocates an array and uses an in-place new.
-    UStringImpl() { }
-
-    // Used to construct static strings, which have an special refCount that can never hit zero.
-    // This means that the static string will never be destroyed, which is important because
-    // static strings will be shared across threads & ref-counted in a non-threadsafe manner.
-    UStringImpl(const UChar* characters, unsigned length, StaticStringConstructType)
-        : UStringOrRopeImpl(length, ConstructStaticString)
-        , m_data(characters)
-        , m_buffer(0)
-        , m_hash(0)
-    {
-        hash();
-    }
-
-    // Create a normal string with internal storage (BufferInternal)
-    UStringImpl(unsigned length)
-        : UStringOrRopeImpl(length, BufferInternal)
-        , m_data(reinterpret_cast<UChar*>(this + 1))
-        , m_buffer(0)
-        , m_hash(0)
-    {
-        ASSERT(m_data);
-        ASSERT(m_length);
-    }
-
-    // Create a UStringImpl adopting ownership of the provided buffer (BufferOwned)
-    UStringImpl(const UChar* characters, unsigned length)
-        : UStringOrRopeImpl(length, BufferOwned)
-        , m_data(characters)
-        , m_buffer(0)
-        , m_hash(0)
-    {
-        ASSERT(m_data);
-        ASSERT(m_length);
-    }
-
-    // Used to create new strings that are a substring of an existing UStringImpl (BufferSubstring)
-    UStringImpl(const UChar* characters, unsigned length, PassRefPtr<UStringImpl> base)
-        : UStringOrRopeImpl(length, BufferSubstring)
-        , m_data(characters)
-        , m_substringBuffer(base.releaseRef())
-        , m_hash(0)
-    {
-        ASSERT(m_data);
-        ASSERT(m_length);
-        ASSERT(m_substringBuffer->bufferOwnership() != BufferSubstring);
-    }
-
-    // Used to construct new strings sharing an existing SharedUChar (BufferShared)
-    UStringImpl(const UChar* characters, unsigned length, PassRefPtr<SharedUChar> sharedBuffer)
-        : UStringOrRopeImpl(length, BufferShared)
-        , m_data(characters)
-        , m_sharedBuffer(sharedBuffer.releaseRef())
-        , m_hash(0)
-    {
-        ASSERT(m_data);
-        ASSERT(m_length);
-    }
-
-    // For use only by Identifier's XXXTranslator helpers.
-    void setHash(unsigned hash)
-    {
-        ASSERT(!isStatic());
-        ASSERT(!m_hash);
-        ASSERT(hash == computeHash(m_data, m_length));
-        m_hash = hash;
-    }
-
-public:
-    ~UStringImpl();
-
-    static PassRefPtr<UStringImpl> create(const UChar*, unsigned length);
-    static PassRefPtr<UStringImpl> create(const char*, unsigned length);
-    static PassRefPtr<UStringImpl> create(const char*);
-    static PassRefPtr<UStringImpl> create(const UChar*, unsigned length, PassRefPtr<SharedUChar>);
-    static PassRefPtr<UStringImpl> create(PassRefPtr<UStringImpl> rep, unsigned offset, unsigned length)
-    {
-        ASSERT(rep);
-        ASSERT(length <= rep->length());
-
-        if (!length)
-            return empty();
-
-        UStringImpl* ownerRep = (rep->bufferOwnership() == BufferSubstring) ? rep->m_substringBuffer : rep.get();
-        return adoptRef(new UStringImpl(rep->m_data + offset, length, ownerRep));
-    }
-
-    static PassRefPtr<UStringImpl> createUninitialized(unsigned length, UChar*& output);
-    static PassRefPtr<UStringImpl> tryCreateUninitialized(unsigned length, UChar*& output)
-    {
-        if (!length) {
-            output = 0;
-            return empty();
-        }
-
-        if (length > ((std::numeric_limits<size_t>::max() - sizeof(UStringImpl)) / sizeof(UChar)))
-            return 0;
-        UStringImpl* resultImpl;
-        if (!tryFastMalloc(sizeof(UChar) * length + sizeof(UStringImpl)).getValue(resultImpl))
-            return 0;
-        output = reinterpret_cast<UChar*>(resultImpl + 1);
-        return adoptRef(new(resultImpl) UStringImpl(length));
-    }
-
-    template<size_t inlineCapacity>
-    static PassRefPtr<UStringImpl> adopt(Vector<UChar, inlineCapacity>& vector)
-    {
-        if (size_t size = vector.size()) {
-            ASSERT(vector.data());
-            return adoptRef(new UStringImpl(vector.releaseBuffer(), size));
-        }
-        return empty();
-    }
-
-    SharedUChar* sharedBuffer();
-    const UChar* characters() const { return m_data; }
-
-    size_t cost()
-    {
-        // For substrings, return the cost of the base string.
-        if (bufferOwnership() == BufferSubstring)
-            return m_substringBuffer->cost();
-
-        if (m_refCountAndFlags & s_refCountFlagShouldReportedCost) {
-            m_refCountAndFlags &= ~s_refCountFlagShouldReportedCost;
-            return m_length;
-        }
-        return 0;
-    }
-
-    bool isIdentifier() const { return m_refCountAndFlags & s_refCountFlagIsIdentifier; }
-    void setIsIdentifier(bool isIdentifier)
-    {
-        ASSERT(!isStatic());
-        if (isIdentifier)
-            m_refCountAndFlags |= s_refCountFlagIsIdentifier;
-        else
-            m_refCountAndFlags &= ~s_refCountFlagIsIdentifier;
-    }
-
-    unsigned hash() const { if (!m_hash) m_hash = computeHash(m_data, m_length); return m_hash; }
-    unsigned existingHash() const { ASSERT(m_hash); return m_hash; }
-    static unsigned computeHash(const UChar* data, unsigned length) { return WTF::stringHash(data, length); }
-    static unsigned computeHash(const char* data, unsigned length) { return WTF::stringHash(data, length); }
-    static unsigned computeHash(const char* data) { return WTF::stringHash(data); }
-
-    ALWAYS_INLINE void deref() { m_refCountAndFlags -= s_refCountIncrement; if (!(m_refCountAndFlags & (s_refCountMask | s_refCountFlagStatic))) delete this; }
-
-    static UStringImpl* empty();
-
-    static void copyChars(UChar* destination, const UChar* source, unsigned numCharacters)
-    {
-        if (numCharacters <= s_copyCharsInlineCutOff) {
-            for (unsigned i = 0; i < numCharacters; ++i)
-                destination[i] = source[i];
-        } else
-            memcpy(destination, source, numCharacters * sizeof(UChar));
-    }
-
-private:
-    // This number must be at least 2 to avoid sharing empty, null as well as 1 character strings from SmallStrings.
-    static const unsigned s_copyCharsInlineCutOff = 20;
-
-    BufferOwnership bufferOwnership() const { return static_cast<BufferOwnership>(m_refCountAndFlags & s_refCountMaskBufferOwnership); }
-    bool isStatic() const { return m_refCountAndFlags & s_refCountFlagStatic; }
-
-    const UChar* m_data;
-    union {
-        void* m_buffer;
-        UStringImpl* m_substringBuffer;
-        SharedUChar* m_sharedBuffer;
-    };
-    mutable unsigned m_hash;
-};
-
-class URopeImpl : public UStringOrRopeImpl {
-    friend class UStringOrRopeImpl;
-public:
-    // A URopeImpl is composed from a set of smaller strings called Fibers.
-    // Each Fiber in a rope is either UStringImpl or another URopeImpl.
-    typedef UStringOrRopeImpl* Fiber;
-
-    // Creates a URopeImpl comprising of 'fiberCount' Fibers.
-    // The URopeImpl is constructed in an uninitialized state - initialize must be called for each Fiber in the URopeImpl.
-    static PassRefPtr<URopeImpl> tryCreateUninitialized(unsigned fiberCount)
+    // Creates a RopeImpl comprising of 'fiberCount' Fibers.
+    // The RopeImpl is constructed in an uninitialized state - initialize must be called for each Fiber in the RopeImpl.
+    static PassRefPtr<RopeImpl> tryCreateUninitialized(unsigned fiberCount)
     {
         void* allocation;
-        if (tryFastMalloc(sizeof(URopeImpl) + (fiberCount - 1) * sizeof(Fiber)).getValue(allocation))
-            return adoptRef(new (allocation) URopeImpl(fiberCount));
+        if (tryFastMalloc(sizeof(RopeImpl) + (fiberCount - 1) * sizeof(Fiber)).getValue(allocation))
+            return adoptRef(new (allocation) RopeImpl(fiberCount));
         return 0;
     }
@@ -318 +59 @@
     ALWAYS_INLINE void deref() { m_refCountAndFlags -= s_refCountIncrement; if (!(m_refCountAndFlags & s_refCountMask)) destructNonRecursive(); }
 
+    static bool isRope(Fiber fiber)
+    {
+        return !fiber->isStringImpl();
+    }
+
+    static void deref(Fiber fiber)
+    {
+        if (isRope(fiber))
+            static_cast<RopeImpl*>(fiber)->deref();
+        else
+            static_cast<UStringImpl*>(fiber)->deref();
+    }
+
 private:
-    URopeImpl(unsigned fiberCount) : UStringOrRopeImpl(ConstructRope), m_fiberCount(fiberCount) {}
+    RopeImpl(unsigned fiberCount) : UStringImplBase(ConstructNonStringImpl), m_fiberCount(fiberCount) {}
 
     void destructNonRecursive();
-    void derefFibersNonRecursive(Vector<URopeImpl*, 32>& workQueue);
+    void derefFibersNonRecursive(Vector<RopeImpl*, 32>& workQueue);
 
     bool hasOneRef() { return (m_refCountAndFlags & s_refCountMask) == s_refCountIncrement; }
@@ -330 +84 @@
 };
 
-inline void UStringOrRopeImpl::deref()
-{
-    if (isRope())
-        static_cast<URopeImpl*>(this)->deref();
-    else
-        static_cast<UStringImpl*>(this)->deref();
-}
-
-bool equal(const UStringImpl*, const UStringImpl*);
-
 }
 

trunk/JavaScriptCore/runtime/UStringImpl.cpp

@@ -159 +159 @@
 }
 
-void URopeImpl::derefFibersNonRecursive(Vector<URopeImpl*, 32>& workQueue)
-{
-    unsigned length = fiberCount();
-    for (unsigned i = 0; i < length; ++i) {
-        Fiber& fiber = fibers(i);
-        if (fiber->isRope()) {
-            URopeImpl* nextRope = static_cast<URopeImpl*>(fiber);
-            if (nextRope->hasOneRef())
-                workQueue.append(nextRope);
-            else
-                nextRope->deref();
-        } else
-            static_cast<UStringImpl*>(fiber)->deref();
-    }
-}
-
-void URopeImpl::destructNonRecursive()
-{
-    Vector<URopeImpl*, 32> workQueue;
-
-    derefFibersNonRecursive(workQueue);
-    delete this;
-
-    while (!workQueue.isEmpty()) {
-        URopeImpl* rope = workQueue.last();
-        workQueue.removeLast();
-        rope->derefFibersNonRecursive(workQueue);
-        delete rope;
-    }
-}
-
 } // namespace JSC

trunk/JavaScriptCore/runtime/UStringImpl.h

@@ -42 +42 @@
 typedef CrossThreadRefCounted<SharableUChar> SharedUChar;
 
-class UStringOrRopeImpl : public Noncopyable {
+class UStringImplBase : public Noncopyable {
 public:
-    bool isRope() { return (m_refCountAndFlags & s_refCountIsRope) == s_refCountIsRope; }
+    bool isStringImpl() { return (m_refCountAndFlags & s_refCountInvalidForStringImpl) != s_refCountInvalidForStringImpl; }
     unsigned length() const { return m_length; }
 
     void ref() { m_refCountAndFlags += s_refCountIncrement; }
-    inline void deref();
 
 protected:
@@ -62 +61 @@
 
     // For SmallStringStorage, which allocates an array and uses an in-place new.
-    UStringOrRopeImpl() { }
-
-    UStringOrRopeImpl(unsigned length, BufferOwnership ownership)
+    UStringImplBase() { }
+
+    UStringImplBase(unsigned length, BufferOwnership ownership)
         : m_refCountAndFlags(s_refCountIncrement | s_refCountFlagShouldReportedCost | ownership)
         , m_length(length)
     {
-        ASSERT(!isRope());
+        ASSERT(isStringImpl());
     }
 
     enum StaticStringConstructType { ConstructStaticString };
-    UStringOrRopeImpl(unsigned length, StaticStringConstructType)
+    UStringImplBase(unsigned length, StaticStringConstructType)
         : m_refCountAndFlags(s_refCountFlagStatic | s_refCountFlagIsIdentifier | BufferOwned)
         , m_length(length)
     {
-        ASSERT(!isRope());
-    }
-
-    enum RopeConstructType { ConstructRope };
-    UStringOrRopeImpl(RopeConstructType)
-        : m_refCountAndFlags(s_refCountIncrement | s_refCountIsRope)
+        ASSERT(isStringImpl());
+    }
+
+    // This constructor is not used when creating UStringImpl objects,
+    // and sets the flags into a state marking the object as such.
+    enum NonStringImplConstructType { ConstructNonStringImpl };
+    UStringImplBase(NonStringImplConstructType)
+        : m_refCountAndFlags(s_refCountIncrement | s_refCountInvalidForStringImpl)
         , m_length(0)
     {
-        ASSERT(isRope());
+        ASSERT(!isStringImpl());
     }
 
@@ -96 +97 @@
     static const unsigned s_refCountFlagIsIdentifier = 0x4;
     static const unsigned s_refCountMaskBufferOwnership = 0x3;
-    // Use an otherwise invalid permutation of flags (static & shouldReportedCost -
-    // static strings do not set shouldReportedCost in the constructor, and this bit
-    // is only ever cleared, not set) to identify objects that are ropes.
-    static const unsigned s_refCountIsRope = s_refCountFlagStatic | s_refCountFlagShouldReportedCost;
+    // An invalid permutation of flags (static & shouldReportedCost - static strings do not
+    // set shouldReportedCost in the constructor, and this bit is only ever cleared, not set).
+    // Used by "ConstructNonStringImpl" constructor, above.
+    static const unsigned s_refCountInvalidForStringImpl = s_refCountFlagStatic | s_refCountFlagShouldReportedCost;
 
     unsigned m_refCountAndFlags;
@@ -105 +106 @@
 };
 
-class UStringImpl : public UStringOrRopeImpl {
+class UStringImpl : public UStringImplBase {
     friend struct CStringTranslator;
     friend struct UCharBufferTranslator;
     friend class JIT;
     friend class SmallStringsStorage;
-    friend class UStringOrRopeImpl;
     friend void initializeUString();
 private:
@@ -120 +120 @@
     // static strings will be shared across threads & ref-counted in a non-threadsafe manner.
     UStringImpl(const UChar* characters, unsigned length, StaticStringConstructType)
-        : UStringOrRopeImpl(length, ConstructStaticString)
+        : UStringImplBase(length, ConstructStaticString)
         , m_data(characters)
         , m_buffer(0)
@@ -130 +130 @@
     // Create a normal string with internal storage (BufferInternal)
     UStringImpl(unsigned length)
-        : UStringOrRopeImpl(length, BufferInternal)
+        : UStringImplBase(length, BufferInternal)
         , m_data(reinterpret_cast<UChar*>(this + 1))
         , m_buffer(0)
@@ -141 +141 @@
     // Create a UStringImpl adopting ownership of the provided buffer (BufferOwned)
     UStringImpl(const UChar* characters, unsigned length)
-        : UStringOrRopeImpl(length, BufferOwned)
+        : UStringImplBase(length, BufferOwned)
         , m_data(characters)
         , m_buffer(0)
@@ -152 +152 @@
     // Used to create new strings that are a substring of an existing UStringImpl (BufferSubstring)
     UStringImpl(const UChar* characters, unsigned length, PassRefPtr<UStringImpl> base)
-        : UStringOrRopeImpl(length, BufferSubstring)
+        : UStringImplBase(length, BufferSubstring)
         , m_data(characters)
         , m_substringBuffer(base.releaseRef())
@@ -164 +164 @@
     // Used to construct new strings sharing an existing SharedUChar (BufferShared)
     UStringImpl(const UChar* characters, unsigned length, PassRefPtr<SharedUChar> sharedBuffer)
-        : UStringOrRopeImpl(length, BufferShared)
+        : UStringImplBase(length, BufferShared)
         , m_data(characters)
         , m_sharedBuffer(sharedBuffer.releaseRef())
@@ -289 +289 @@
 };
 
-class URopeImpl : public UStringOrRopeImpl {
-    friend class UStringOrRopeImpl;
-public:
-    // A URopeImpl is composed from a set of smaller strings called Fibers.
-    // Each Fiber in a rope is either UStringImpl or another URopeImpl.
-    typedef UStringOrRopeImpl* Fiber;
-
-    // Creates a URopeImpl comprising of 'fiberCount' Fibers.
-    // The URopeImpl is constructed in an uninitialized state - initialize must be called for each Fiber in the URopeImpl.
-    static PassRefPtr<URopeImpl> tryCreateUninitialized(unsigned fiberCount)
-    {
-        void* allocation;
-        if (tryFastMalloc(sizeof(URopeImpl) + (fiberCount - 1) * sizeof(Fiber)).getValue(allocation))
-            return adoptRef(new (allocation) URopeImpl(fiberCount));
-        return 0;
-    }
-
-    void initializeFiber(unsigned &index, Fiber fiber)
-    {
-        m_fibers[index++] = fiber;
-        fiber->ref();
-        m_length += fiber->length();
-    }
-
-    unsigned fiberCount() { return m_fiberCount; }
-    Fiber& fibers(unsigned index) { return m_fibers[index]; }
-
-    ALWAYS_INLINE void deref() { m_refCountAndFlags -= s_refCountIncrement; if (!(m_refCountAndFlags & s_refCountMask)) destructNonRecursive(); }
-
-private:
-    URopeImpl(unsigned fiberCount) : UStringOrRopeImpl(ConstructRope), m_fiberCount(fiberCount) {}
-
-    void destructNonRecursive();
-    void derefFibersNonRecursive(Vector<URopeImpl*, 32>& workQueue);
-
-    bool hasOneRef() { return (m_refCountAndFlags & s_refCountMask) == s_refCountIncrement; }
-
-    unsigned m_fiberCount;
-    Fiber m_fibers[1];
-};
-
-inline void UStringOrRopeImpl::deref()
-{
-    if (isRope())
-        static_cast<URopeImpl*>(this)->deref();
-    else
-        static_cast<UStringImpl*>(this)->deref();
+bool equal(const UStringImpl*, const UStringImpl*);
+
 }
 
-bool equal(const UStringImpl*, const UStringImpl*);
-
-}
-
 #endif