Changeset 53400 in webkit for trunk/JavaScriptCore/bytecode/CodeBlock.h

Timestamp:

Jan 18, 2010, 4:14:49 AM (15 years ago)

Author:

Csaba Osztrogonác

Message:

Rubber-stamped by Gustavo Noronha Silva.

Rolling out r53391 and r53392 because of random crashes on buildbots.
​https://bugs.webkit.org/show_bug.cgi?id=33731

• bytecode/CodeBlock.h:

(JSC::CallLinkInfo::seenOnce):
(JSC::CallLinkInfo::setSeen):
(JSC::MethodCallLinkInfo::MethodCallLinkInfo):
(JSC::MethodCallLinkInfo::seenOnce):
(JSC::MethodCallLinkInfo::setSeen):

• jit/JIT.cpp:

(JSC::JIT::unlinkCall):

• jit/JITPropertyAccess.cpp:

(JSC::JIT::patchMethodCallProto):

• runtime/UString.cpp:

(JSC::UString::spliceSubstringsWithSeparators):
(JSC::UString::replaceRange):

• runtime/UString.h:
• runtime/UStringImpl.cpp:

(JSC::UStringImpl::baseSharedBuffer):
(JSC::UStringImpl::sharedBuffer):
(JSC::UStringImpl::~UStringImpl):

• runtime/UStringImpl.h:

(JSC::UntypedPtrAndBitfield::UntypedPtrAndBitfield):
(JSC::UntypedPtrAndBitfield::asPtr):
(JSC::UntypedPtrAndBitfield::operator&=):
(JSC::UntypedPtrAndBitfield::operator|=):
(JSC::UntypedPtrAndBitfield::operator&):
(JSC::UStringImpl::create):
(JSC::UStringImpl::cost):
(JSC::UStringImpl::isIdentifier):
(JSC::UStringImpl::setIsIdentifier):
(JSC::UStringImpl::ref):
(JSC::UStringImpl::deref):
(JSC::UStringImpl::checkConsistency):
(JSC::UStringImpl::UStringImpl):
(JSC::UStringImpl::bufferOwnerString):
(JSC::UStringImpl::bufferOwnership):
(JSC::UStringImpl::isStatic):

• wtf/StringHashFunctions.h:

(WTF::stringHash):

File:

• trunk/JavaScriptCore/bytecode/CodeBlock.h (modified) (4 diffs)

trunk/JavaScriptCore/bytecode/CodeBlock.h

@@ -111 +111 @@
         CodeLocationDataLabelPtr hotPathBegin;
         CodeLocationNearCall hotPathOther;
-        CodeBlock* ownerCodeBlock;
+        PtrAndFlags<CodeBlock, HasSeenShouldRepatch> ownerCodeBlock;
         CodeBlock* callee;
-        unsigned position : 31;
-        unsigned hasSeenShouldRepatch : 1;
+        unsigned position;
         
         void setUnlinked() { callee = 0; }
@@ -121 +120 @@
         bool seenOnce()
         {
-            return hasSeenShouldRepatch;
+            return ownerCodeBlock.isFlagSet(hasSeenShouldRepatch);
         }
 
         void setSeen()
         {
-            hasSeenShouldRepatch = true;
-        }
-    };
-
-#define MethodCallLinkInfo_seenFlag ((Structure*)1)
+            ownerCodeBlock.setFlag(hasSeenShouldRepatch);
+        }
+    };
 
     struct MethodCallLinkInfo {
         MethodCallLinkInfo()
             : cachedStructure(0)
-            , cachedPrototypeStructure(0)
         {
         }
@@ -141 +137 @@
         bool seenOnce()
         {
-            ASSERT(!cachedStructure);
-            return cachedPrototypeStructure;
+            return cachedPrototypeStructure.isFlagSet(hasSeenShouldRepatch);
         }
 
         void setSeen()
         {
-            ASSERT(!cachedStructure && !cachedPrototypeStructure);
-            // We use the values of cachedStructure & cachedPrototypeStructure to indicate the
-            // current state.
-            //     - In the initial state, both are null.
-            //     - Once this transition has been taken once, cachedStructure is
-            //       null and cachedPrototypeStructure is set to a nun-null value.
-            //     - Once the call is linked both structures are set to non-null values.
-            cachedPrototypeStructure = MethodCallLinkInfo_seenFlag;
+            cachedPrototypeStructure.setFlag(hasSeenShouldRepatch);
         }
 
@@ -160 +148 @@
         CodeLocationDataLabelPtr structureLabel;
         Structure* cachedStructure;
-        Structure* cachedPrototypeStructure;
+        PtrAndFlags<Structure, HasSeenShouldRepatch> cachedPrototypeStructure;
     };