Changeset 35657 in webkit for trunk/JavaScriptCore

Timestamp:

Aug 10, 2008, 3:06:13 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Sam Weinig.

Added same heap debug checks to more code paths.

• kjs/JSActivation.cpp: (KJS::JSActivation::put): (KJS::JSActivation::putWithAttributes):
• kjs/JSGlobalObject.cpp: (KJS::JSGlobalObject::putWithAttributes):
• kjs/JSObject.h: (KJS::JSObject::putDirect):
• kjs/JSVariableObject.h: (KJS::JSVariableObject::symbolTablePut): (KJS::JSVariableObject::symbolTablePutWithAttributes):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/JSActivation.cpp (modified) (2 diffs)
• kjs/JSGlobalObject.cpp (modified) (1 diff)
• kjs/JSObject.h (modified) (1 diff)
• kjs/JSVariableObject.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-08-09  Alexey Proskuryakov  <[email protected]>
+
+        Reviewed by Sam Weinig.
+
+        Added same heap debug checks to more code paths.
+
+        * kjs/JSActivation.cpp:
+        (KJS::JSActivation::put):
+        (KJS::JSActivation::putWithAttributes):
+        * kjs/JSGlobalObject.cpp:
+        (KJS::JSGlobalObject::putWithAttributes):
+        * kjs/JSObject.h:
+        (KJS::JSObject::putDirect):
+        * kjs/JSVariableObject.h:
+        (KJS::JSVariableObject::symbolTablePut):
+        (KJS::JSVariableObject::symbolTablePutWithAttributes):
+
 2008-08-09  Cameron Zwarich  <[email protected]>
 

trunk/JavaScriptCore/kjs/JSActivation.cpp

@@ -84 +84 @@
 void JSActivation::put(ExecState*, const Identifier& propertyName, JSValue* value)
 {
+    ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
+
     if (symbolTablePut(propertyName, value))
         return;
@@ -97 +99 @@
 void JSActivation::putWithAttributes(ExecState*, const Identifier& propertyName, JSValue* value, unsigned attributes)
 {
+    ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
+
     if (symbolTablePutWithAttributes(propertyName, value, attributes))
         return;

trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

@@ -140 +140 @@
 void JSGlobalObject::putWithAttributes(ExecState* exec, const Identifier& propertyName, JSValue* value, unsigned attributes)
 {
+    ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
+
     if (symbolTablePutWithAttributes(propertyName, value, attributes))
         return;

trunk/JavaScriptCore/kjs/JSObject.h

@@ -477 +477 @@
 inline void JSObject::putDirect(const Identifier& propertyName, JSValue* value, unsigned attr)
 {
+    ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
+
     m_propertyMap.put(propertyName, value, attr);
 }

trunk/JavaScriptCore/kjs/JSVariableObject.h

@@ -126 +126 @@
     inline bool JSVariableObject::symbolTablePut(const Identifier& propertyName, JSValue* value)
     {
+        ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
+
         SymbolTableEntry entry = symbolTable().inlineGet(propertyName.ustring().rep());
         if (entry.isNull())
@@ -137 +139 @@
     inline bool JSVariableObject::symbolTablePutWithAttributes(const Identifier& propertyName, JSValue* value, unsigned attributes)
     {
+        ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
+
         SymbolTable::iterator iter = symbolTable().find(propertyName.ustring().rep());
         if (iter == symbolTable().end())