Changeset 2741 in webkit for trunk/JavaScriptCore/kjs/object.cpp

Timestamp:

Nov 18, 2002, 5:01:16 PM (23 years ago)

Author:

mjs

Message:

JavaScriptCore:

Partway to removing Value from List. Created a marking List
variant, used it in place of ListImp.

• kjs/internal.h: Removed List stuff.
• kjs/internal.cpp: (InterpreterImp::mark): Call appropriate List method to do marking of empty ListImp.
• kjs/object.h:
• kjs/object.cpp: Use marking List instead of ListImp *.
• kjs/types.h:
• kjs/types.cpp: (List::List): New boolean needsMarking parameter. (List::operator=): Perform trickery related to needsMarking. (List::~List): Likewise. (List::mark): Mark the ListImp. (List::markEmptyList): (ListImp::*): Moved here fron internal.cpp, they will be integrated into the relevant List methods soon.

WebCore:

• force-js-clean-timestamp: Rebuild for JSC changes.

File:

• trunk/JavaScriptCore/kjs/object.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/object.cpp

@@ -62 +62 @@
 
 ObjectImp::ObjectImp(const Object &proto)
-  : _prop(0), _proto(static_cast<ObjectImp*>(proto.imp())), _internalValue(0L), _scope(0)
+  : _prop(0), _proto(static_cast<ObjectImp*>(proto.imp())), _internalValue(0L), _scope(true)
 {
   //fprintf(stderr,"ObjectImp::ObjectImp %p\n",(void*)this);
-  _scope = ListImp::empty();
-  _scope->setGcAllowed();
   _prop = new PropertyMap();
 }
 
-ObjectImp::ObjectImp()
+ObjectImp::ObjectImp() :
+  _scope(true)
 {
   //fprintf(stderr,"ObjectImp::ObjectImp %p\n",(void*)this);
@@ -76 +75 @@
   _proto = NullImp::staticNull;
   _internalValue = 0L;
-  _scope = ListImp::empty();
-  _scope->setGcAllowed();
   _prop = new PropertyMap();
 }
@@ -99 +96 @@
   if (_internalValue && !_internalValue->marked())
     _internalValue->mark();
-  if (_scope && !_scope->marked())
-    _scope->mark();
+
+  _scope.mark();
 }
 
@@ -391 +388 @@
 void ObjectImp::setScope(const List &s)
 {
-  if (_scope) _scope->setGcAllowed();
-  _scope = static_cast<ListImp*>(s.imp());
+  _scope = s;
 }