Changeset 2783 in webkit for trunk/JavaScriptCore

Timestamp:

Nov 20, 2002, 1:12:14 PM (23 years ago)

Author:

darin

Message:

• decrease ref/deref -- 5% speedup in iBench

• JavaScriptCore.pbproj/project.pbxproj: Added array_instance.h
• kjs/array_instance.h: Added so it can be shared by function.h.

• kjs/array_object.cpp:
• kjs/array_object.h:
• kjs/bool_object.cpp:
• kjs/bool_object.h:
• kjs/collector.cpp:
• kjs/date_object.cpp:
• kjs/date_object.h:
• kjs/error_object.cpp:
• kjs/function.cpp:
• kjs/function.h:
• kjs/function_object.cpp:
• kjs/internal.cpp:
• kjs/internal.h:
• kjs/math_object.cpp:
• kjs/nodes.cpp:
• kjs/number_object.cpp:
• kjs/object.cpp:
• kjs/object.h:
• kjs/object_object.cpp:
• kjs/property_map.cpp:
• kjs/reference.cpp:
• kjs/reference.h:
• kjs/regexp_object.cpp:
• kjs/string_object.cpp:
• kjs/string_object.h:
• kjs/value.cpp:
• kjs/value.h: Switched lots of interfaces so they don't require ref/deref.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• ChangeLog-2002-12-03 (modified) (1 diff)
• ChangeLog-2003-10-25 (modified) (1 diff)
• JavaScriptCore.pbproj/project.pbxproj (modified) (3 diffs)
• kjs/array_instance.h (added)
• kjs/array_object.cpp (modified) (5 diffs)
• kjs/array_object.h (modified) (1 diff)
• kjs/bool_object.cpp (modified) (5 diffs)
• kjs/bool_object.h (modified) (1 diff)
• kjs/collector.cpp (modified) (9 diffs)
• kjs/date_object.cpp (modified) (6 diffs)
• kjs/date_object.h (modified) (1 diff)
• kjs/error_object.cpp (modified) (9 diffs)
• kjs/function.cpp (modified) (3 diffs)
• kjs/function.h (modified) (4 diffs)
• kjs/function_object.cpp (modified) (4 diffs)
• kjs/internal.cpp (modified) (4 diffs)
• kjs/internal.h (modified) (2 diffs)
• kjs/math_object.cpp (modified) (2 diffs)
• kjs/nodes.cpp (modified) (1 diff)
• kjs/number_object.cpp (modified) (3 diffs)
• kjs/object.cpp (modified) (7 diffs)
• kjs/object.h (modified) (4 diffs)
• kjs/object_object.cpp (modified) (3 diffs)
• kjs/property_map.cpp (modified) (1 diff)
• kjs/reference.cpp (modified) (1 diff)
• kjs/reference.h (modified) (1 diff)
• kjs/regexp_object.cpp (modified) (8 diffs)
• kjs/string_object.cpp (modified) (7 diffs)
• kjs/string_object.h (modified) (1 diff)
• kjs/value.cpp (modified) (4 diffs)
• kjs/value.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2002-11-20  Darin Adler  <[email protected]>
+
+        - decrease ref/deref -- 5% speedup in iBench
+
+        * JavaScriptCore.pbproj/project.pbxproj: Added array_instance.h
+        * kjs/array_instance.h: Added so it can be shared by function.h.
+
+        * kjs/array_object.cpp:
+        * kjs/array_object.h:
+        * kjs/bool_object.cpp:
+        * kjs/bool_object.h:
+        * kjs/collector.cpp:
+        * kjs/date_object.cpp:
+        * kjs/date_object.h:
+        * kjs/error_object.cpp:
+        * kjs/function.cpp:
+        * kjs/function.h:
+        * kjs/function_object.cpp:
+        * kjs/internal.cpp:
+        * kjs/internal.h:
+        * kjs/math_object.cpp:
+        * kjs/nodes.cpp:
+        * kjs/number_object.cpp:
+        * kjs/object.cpp:
+        * kjs/object.h:
+        * kjs/object_object.cpp:
+        * kjs/property_map.cpp:
+        * kjs/reference.cpp:
+        * kjs/reference.h:
+        * kjs/regexp_object.cpp:
+        * kjs/string_object.cpp:
+        * kjs/string_object.h:
+        * kjs/value.cpp:
+        * kjs/value.h:
+        Switched lots of interfaces so they don't require ref/deref.
+
 2002-11-20  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/ChangeLog-2002-12-03

@@ +1 @@
+2002-11-20  Darin Adler  <[email protected]>
+
+        - decrease ref/deref -- 5% speedup in iBench
+
+        * JavaScriptCore.pbproj/project.pbxproj: Added array_instance.h
+        * kjs/array_instance.h: Added so it can be shared by function.h.
+
+        * kjs/array_object.cpp:
+        * kjs/array_object.h:
+        * kjs/bool_object.cpp:
+        * kjs/bool_object.h:
+        * kjs/collector.cpp:
+        * kjs/date_object.cpp:
+        * kjs/date_object.h:
+        * kjs/error_object.cpp:
+        * kjs/function.cpp:
+        * kjs/function.h:
+        * kjs/function_object.cpp:
+        * kjs/internal.cpp:
+        * kjs/internal.h:
+        * kjs/math_object.cpp:
+        * kjs/nodes.cpp:
+        * kjs/number_object.cpp:
+        * kjs/object.cpp:
+        * kjs/object.h:
+        * kjs/object_object.cpp:
+        * kjs/property_map.cpp:
+        * kjs/reference.cpp:
+        * kjs/reference.h:
+        * kjs/regexp_object.cpp:
+        * kjs/string_object.cpp:
+        * kjs/string_object.h:
+        * kjs/value.cpp:
+        * kjs/value.h:
+        Switched lots of interfaces so they don't require ref/deref.
+
 2002-11-20  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/ChangeLog-2003-10-25

@@ +1 @@
+2002-11-20  Darin Adler  <[email protected]>
+
+        - decrease ref/deref -- 5% speedup in iBench
+
+        * JavaScriptCore.pbproj/project.pbxproj: Added array_instance.h
+        * kjs/array_instance.h: Added so it can be shared by function.h.
+
+        * kjs/array_object.cpp:
+        * kjs/array_object.h:
+        * kjs/bool_object.cpp:
+        * kjs/bool_object.h:
+        * kjs/collector.cpp:
+        * kjs/date_object.cpp:
+        * kjs/date_object.h:
+        * kjs/error_object.cpp:
+        * kjs/function.cpp:
+        * kjs/function.h:
+        * kjs/function_object.cpp:
+        * kjs/internal.cpp:
+        * kjs/internal.h:
+        * kjs/math_object.cpp:
+        * kjs/nodes.cpp:
+        * kjs/number_object.cpp:
+        * kjs/object.cpp:
+        * kjs/object.h:
+        * kjs/object_object.cpp:
+        * kjs/property_map.cpp:
+        * kjs/reference.cpp:
+        * kjs/reference.h:
+        * kjs/regexp_object.cpp:
+        * kjs/string_object.cpp:
+        * kjs/string_object.h:
+        * kjs/value.cpp:
+        * kjs/value.h:
+        Switched lots of interfaces so they don't require ref/deref.
+
 2002-11-20  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj

@@ -224 +224 @@
                                 F5BB2BC7030F772101FCFE1D,
                                 933A349C038AE7C6008635CE,
+                                938772E6038BFE19008635CE,
                         );
                         isa = PBXHeadersBuildPhase;
@@ -319 +320 @@
                 08FB77AEFE84172EC02AAC07 = {
                         children = (
+                                938772E5038BFE19008635CE,
                                 F692A84D0255597D01FF60F7,
                                 F692A84E0255597D01FF60F7,
@@ -472 +474 @@
                         };
                 };
+                938772E5038BFE19008635CE = {
+                        fileEncoding = 4;
+                        isa = PBXFileReference;
+                        path = array_instance.h;
+                        refType = 4;
+                };
+                938772E6038BFE19008635CE = {
+                        fileRef = 938772E5038BFE19008635CE;
+                        isa = PBXBuildFile;
+                        settings = {
+                        };
+                };
 //930
 //931

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -40 +40 @@
 const ClassInfo ArrayInstanceImp::info = {"Array", 0, 0, 0};
 
-ArrayInstanceImp::ArrayInstanceImp(const Object &proto, unsigned initialLength)
+ArrayInstanceImp::ArrayInstanceImp(ObjectImp *proto, unsigned initialLength)
   : ObjectImp(proto)
   , length(initialLength)
@@ -48 +48 @@
 }
 
-ArrayInstanceImp::ArrayInstanceImp(const Object &proto, const List &list)
+ArrayInstanceImp::ArrayInstanceImp(ObjectImp *proto, const List &list)
   : ObjectImp(proto)
   , length(list.size())
@@ -290 +290 @@
 ArrayPrototypeImp::ArrayPrototypeImp(ExecState *exec,
                                      ObjectPrototypeImp *objProto)
-  : ArrayInstanceImp(Object(objProto), 0)
+  : ArrayInstanceImp(objProto, 0)
 {
   Value protect(this);
@@ -665 +665 @@
   // a single numeric argument denotes the array size (!)
   if (args.size() == 1 && args[0].type() == NumberType)
-    return Object(new ArrayInstanceImp(exec->interpreter()->builtinArrayPrototype(), args[0].toUInt32(exec)));
+    return Object(new ArrayInstanceImp(exec->interpreter()->builtinArrayPrototype().imp(), args[0].toUInt32(exec)));
 
   // otherwise the array is constructed with the arguments in it
-  return Object(new ArrayInstanceImp(exec->interpreter()->builtinArrayPrototype(), args));
+  return Object(new ArrayInstanceImp(exec->interpreter()->builtinArrayPrototype().imp(), args));
 }
 
@@ -682 +682 @@
   return construct(exec,args);
 }
-

trunk/JavaScriptCore/kjs/array_object.h

@@ -27 +27 @@
 
 namespace KJS {
-
-  class ArrayInstanceImp : public ObjectImp {
-  public:
-    ArrayInstanceImp(const Object &proto, unsigned initialLength);
-    ArrayInstanceImp(const Object &proto, const List &initialValues);
-    ~ArrayInstanceImp();
-
-    virtual Value get(ExecState *exec, const Identifier &propertyName) const;
-    virtual Value get(ExecState *exec, unsigned propertyName) const;
-    virtual void put(ExecState *exec, const Identifier &propertyName, const Value &value, int attr = None);
-    virtual void put(ExecState *exec, unsigned propertyName, const Value &value, int attr = None);
-    virtual bool hasProperty(ExecState *exec, const Identifier &propertyName) const;
-    virtual bool hasProperty(ExecState *exec, unsigned propertyName) const;
-    virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
-    virtual bool deleteProperty(ExecState *exec, unsigned propertyName);
-
-    virtual void mark();
-
-    virtual const ClassInfo *classInfo() const { return &info; }
-    static const ClassInfo info;
-    
-    unsigned getLength() const { return length; }
-    
-    void sort(ExecState *exec);
-    void sort(ExecState *exec, Object &compareFunction);
-    
-  private:
-    void setLength(unsigned newLength);
-    
-    unsigned pushUndefinedObjectsToEnd();
-    
-    unsigned length;
-    unsigned capacity;
-    ValueImp **storage;
-  };
 
  class ArrayPrototypeImp : public ArrayInstanceImp {

trunk/JavaScriptCore/kjs/bool_object.cpp

@@ -36 +36 @@
 const ClassInfo BooleanInstanceImp::info = {"Boolean", 0, 0, 0};
 
-BooleanInstanceImp::BooleanInstanceImp(const Object &proto)
+BooleanInstanceImp::BooleanInstanceImp(ObjectImp *proto)
   : ObjectImp(proto)
 {
@@ -48 +48 @@
                                          ObjectPrototypeImp *objectProto,
                                          FunctionPrototypeImp *funcProto)
-  : BooleanInstanceImp(Object(objectProto))
+  : BooleanInstanceImp(objectProto)
 {
   Value protect(this);
   // The constructor will be added later by InterpreterImp::InterpreterImp()
 
-  put(exec,toStringPropertyName, Object(new BooleanProtoFuncImp(exec,funcProto,BooleanProtoFuncImp::ToString,0)), DontEnum);
-  put(exec,valueOfPropertyName,  Object(new BooleanProtoFuncImp(exec,funcProto,BooleanProtoFuncImp::ValueOf,0)),  DontEnum);
+  putDirect(toStringPropertyName, new BooleanProtoFuncImp(exec,funcProto,BooleanProtoFuncImp::ToString,0), DontEnum);
+  putDirect(valueOfPropertyName,  new BooleanProtoFuncImp(exec,funcProto,BooleanProtoFuncImp::ValueOf,0),  DontEnum);
   setInternalValue(Boolean(false));
 }
@@ -66 +66 @@
 {
   Value protect(this);
-  put(exec,lengthPropertyName,Number(len),DontDelete|ReadOnly|DontEnum);
+  putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
 }
 
@@ -105 +105 @@
 {
   Value protect(this);
-  put(exec,prototypePropertyName, Object(booleanProto),DontEnum|DontDelete|ReadOnly);
+  putDirect(prototypePropertyName, booleanProto, DontEnum|DontDelete|ReadOnly);
 
   // no. of arguments for constructor
-  put(exec,lengthPropertyName, Number(1), ReadOnly|DontDelete|DontEnum);
+  putDirect(lengthPropertyName, NumberImp::one(), ReadOnly|DontDelete|DontEnum);
 }
 
@@ -120 +120 @@
 Object BooleanObjectImp::construct(ExecState *exec, const List &args)
 {
-  Object proto = exec->interpreter()->builtinBooleanPrototype();
-  Object obj(new BooleanInstanceImp(proto));
+  Object obj(new BooleanInstanceImp(exec->interpreter()->builtinBooleanPrototype().imp()));
 
   Boolean b;

trunk/JavaScriptCore/kjs/bool_object.h

@@ -30 +30 @@
   class BooleanInstanceImp : public ObjectImp {
   public:
-    BooleanInstanceImp(const Object &proto);
+    BooleanInstanceImp(ObjectImp *proto);
 
     virtual const ClassInfo *classInfo() const { return &info; }

trunk/JavaScriptCore/kjs/collector.cpp

@@ -100 +100 @@
     heap.oversizeCells[heap.usedOversizeCells] = (CollectorCell *)newCell;
     heap.usedOversizeCells++;
+    heap.numLiveObjects++;
     
     return (void *)newCell;
@@ -141 +142 @@
           targetBlock->bitmap[wordInBitmap] |= (1 << bitInWord);
           targetBlock->usedCells++;
+          heap.numLiveObjects++;
           return (void *)(targetBlock->cells + cellPos);
         }
@@ -293 +295 @@
 
 #if APPLE_CHANGES
+
 int Collector::numInterpreters()
 {
@@ -343 +346 @@
         
         if ((word & (1 << bitInWord)) &&
-            imp->refcount == 0) {
+            imp->refcount != 0) {
           ++count;
         }
@@ -352 +355 @@
   for (int cell = 0; cell < heap.usedOversizeCells; cell++) {
     ValueImp *imp = (ValueImp *)heap.oversizeCells[cell];
-      if (imp->refcount == 0) {
+      if (imp->refcount != 0) {
         ++count;
       }
@@ -360 +363 @@
 }
 
+// FIXME: Rename. Root object classes are more useful than live object classes.
 CFSetRef Collector::liveObjectClasses()
 {
@@ -370 +374 @@
         ValueImp *imp = (ValueImp *)(heap.blocks[block]->cells + BITS_PER_WORD * wordInBitmap + bitInWord);
         
-        if (word & (1 << bitInWord)) {
+        if (word & (1 << bitInWord)
+                && ((imp->_flags & ValueImp::VI_GCALLOWED) == 0 || imp->refcount != 0)) {
           const char *mangled_name = typeid(*imp).name();
           int status;
@@ -386 +391 @@
   for (int cell = 0; cell < heap.usedOversizeCells; cell++) {
     ValueImp *imp = (ValueImp *)heap.oversizeCells[cell];
-
-    const char *mangled_name = typeid(*imp).name();
-    int status;
-    char *demangled_name = __cxxabiv1::__cxa_demangle (mangled_name, NULL, NULL, &status);
-    
-    CFStringRef className = CFStringCreateWithCString(NULL, demangled_name, kCFStringEncodingASCII);
-    free(demangled_name);
-    CFSetAddValue(classes, className);
-    CFRelease(className);
+    
+    if ((imp->_flags & ValueImp::VI_GCALLOWED) == 0 || imp->refcount != 0) {
+        const char *mangled_name = typeid(*imp).name();
+        int status;
+        char *demangled_name = __cxxabiv1::__cxa_demangle (mangled_name, NULL, NULL, &status);
+        
+        CFStringRef className = CFStringCreateWithCString(NULL, demangled_name, kCFStringEncodingASCII);
+        free(demangled_name);
+        CFSetAddValue(classes, className);
+        CFRelease(className);
+    }
   }
 
@@ -400 +407 @@
 }
 
-#endif
+#endif // APPLE_CHANGES

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -210 +210 @@
 const ClassInfo DateInstanceImp::info = {"Date", 0, 0, 0};
 
-DateInstanceImp::DateInstanceImp(const Object &proto)
+DateInstanceImp::DateInstanceImp(ObjectImp *proto)
   : ObjectImp(proto)
 {
@@ -272 +272 @@
 DatePrototypeImp::DatePrototypeImp(ExecState *,
                                    ObjectPrototypeImp *objectProto)
-  : DateInstanceImp(Object(objectProto))
+  : DateInstanceImp(objectProto)
 {
   Value protect(this);
-  setInternalValue(Number(NaN));
+  setInternalValue(NumberImp::create(NaN));
   // The constructor will be added later, after DateObjectImp has been built
 }
@@ -293 +293 @@
 {
   Value protect(this);
-  put(exec,lengthPropertyName,Number(len),DontDelete|ReadOnly|DontEnum);
+  putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
 }
 
@@ -524 +524 @@
 {
   Value protect(this);
+  
   // ECMA 15.9.4.1 Date.prototype
-  put(exec,prototypePropertyName, Object(dateProto), DontEnum|DontDelete|ReadOnly);
-
-  put(exec,"parse", Object(new DateObjectFuncImp(exec,funcProto,DateObjectFuncImp::Parse, 1)), DontEnum);
-  put(exec,"UTC",   Object(new DateObjectFuncImp(exec,funcProto,DateObjectFuncImp::UTC,   7)),   DontEnum);
+  putDirect(prototypePropertyName, dateProto, DontEnum|DontDelete|ReadOnly);
+
+  static const Identifier parsePropertyName("parse");
+  putDirect(parsePropertyName, new DateObjectFuncImp(exec,funcProto,DateObjectFuncImp::Parse, 1), DontEnum);
+  static const Identifier UTCPropertyName("UTC");
+  putDirect("UTC",   new DateObjectFuncImp(exec,funcProto,DateObjectFuncImp::UTC,   7),   DontEnum);
 
   // no. of arguments for constructor
-  put(exec,lengthPropertyName, Number(7), ReadOnly|DontDelete|DontEnum);
+  putDirect(lengthPropertyName, 7, ReadOnly|DontDelete|DontEnum);
 }
 
@@ -602 +605 @@
 
   Object proto = exec->interpreter()->builtinDatePrototype();
-  Object ret(new DateInstanceImp(proto));
+  Object ret(new DateInstanceImp(proto.imp()));
   ret.setInternalValue(timeClip(value));
   return ret;
@@ -637 +640 @@
 {
   Value protect(this);
-  put(exec,lengthPropertyName,Number(len),DontDelete|ReadOnly|DontEnum);
+  putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
 }
 

trunk/JavaScriptCore/kjs/date_object.h

@@ -32 +32 @@
   class DateInstanceImp : public ObjectImp {
   public:
-    DateInstanceImp(const Object &proto);
+    DateInstanceImp(ObjectImp *proto);
 
     virtual const ClassInfo *classInfo() const { return &info; }

trunk/JavaScriptCore/kjs/error_object.cpp

@@ -36 +36 @@
                                      ObjectPrototypeImp *objectProto,
                                      FunctionPrototypeImp *funcProto)
-  : ObjectImp(Object(objectProto))
+  : ObjectImp(objectProto)
 {
   Value protect(this);
@@ -44 +44 @@
   put(exec, namePropertyName,     String("Error"), DontEnum);
   put(exec, messagePropertyName,  String("Unknown error"), DontEnum);
-  put(exec, toStringPropertyName, Object(new ErrorProtoFuncImp(exec,funcProto)), DontEnum);
+  putDirect(toStringPropertyName, new ErrorProtoFuncImp(exec,funcProto), DontEnum);
 }
 
@@ -53 +53 @@
 {
   Value protect(this);
-  put(exec,lengthPropertyName,Number(0),DontDelete|ReadOnly|DontEnum);
+  putDirect(lengthPropertyName, NumberImp::zero(), DontDelete|ReadOnly|DontEnum);
 }
 
@@ -87 +87 @@
   Value protect(this);
   // ECMA 15.11.3.1 Error.prototype
-  put(exec, prototypePropertyName, Object(errorProto), DontEnum|DontDelete|ReadOnly);
-  //put(exec, namePropertyName, String(n));
+  putDirect(prototypePropertyName, errorProto, DontEnum|DontDelete|ReadOnly);
+  //putDirect(namePropertyName, String(n));
 }
 
@@ -100 +100 @@
 {
   Object proto = Object::dynamicCast(exec->interpreter()->builtinErrorPrototype());
-  Object obj(new ObjectImp(proto));
+  ObjectImp *imp = new ObjectImp(proto);
+  Object obj(imp);
 
   if (!args.isEmpty() && args[0].type() != UndefinedType) {
-    obj.put(exec, messagePropertyName, String(args[0].toString(exec)));
+    imp->putDirect(messagePropertyName, new StringImp(args[0].toString(exec)));
   }
 
@@ -125 +126 @@
 NativeErrorPrototypeImp::NativeErrorPrototypeImp(ExecState *exec, ErrorPrototypeImp *errorProto,
                                                  ErrorType et, UString name, UString message)
-  : ObjectImp(Object(errorProto))
+  : ObjectImp(errorProto)
 {
   Value protect(this);
   errType = et;
-  put(exec, namePropertyName, String(name));
-  put(exec, messagePropertyName, String(message));
+  putDirect(namePropertyName, new StringImp(name), 0);
+  putDirect(messagePropertyName, new StringImp(message), 0);
 }
 
@@ -144 +145 @@
   proto = static_cast<ObjectImp*>(prot.imp());
 
-  put(exec,lengthPropertyName,Number(1),DontDelete|ReadOnly|DontEnum); // ECMA 15.11.7.5
-  put(exec,prototypePropertyName,prot);
+  putDirect(lengthPropertyName, NumberImp::one(), DontDelete|ReadOnly|DontEnum); // ECMA 15.11.7.5
+  putDirect(prototypePropertyName, proto, 0);
 }
 
@@ -155 +156 @@
 Object NativeErrorImp::construct(ExecState *exec, const List &args)
 {
-  Object obj(new ObjectImp(Object(proto)));
+  ObjectImp *imp = new ObjectImp(proto);
+  Object obj(imp);
   if (args[0].type() != UndefinedType)
-    obj.put(exec, messagePropertyName, String(args[0].toString(exec)));
+    imp->putDirect(messagePropertyName, new StringImp(args[0].toString(exec)));
   return obj;
 }
@@ -177 +179 @@
     proto->mark();
 }
-

trunk/JavaScriptCore/kjs/function.cpp

@@ -319 +319 @@
 // ECMA 10.1.8
 ArgumentsImp::ArgumentsImp(ExecState *exec, FunctionImp *func, const List &args)
-  : ObjectImp(exec->interpreter()->builtinObjectPrototype())
+  : ArrayInstanceImp(exec->interpreter()->builtinObjectPrototype().imp(), args)
 {
   Value protect(this);
-  put(exec,calleePropertyName, Object(func), DontEnum);
-  put(exec,lengthPropertyName, Number(args.size()), DontEnum);
-  if (!args.isEmpty()) {
-    ListIterator arg = args.begin();
-    for (int i = 0; arg != args.end(); arg++, i++) {
-      put(exec,i, *arg, DontEnum);
-    }
-  }
+  putDirect(calleePropertyName, func, DontEnum);
 }
 
@@ -338 +331 @@
 // ECMA 10.1.6
 ActivationImp::ActivationImp(ExecState *exec, FunctionImp *f, const List &args)
-  : _function(f)
+  : _function(f), _arguments(args)
 {
   Value protect(this);
-  arguments = new ArgumentsImp(exec,f, args);
-  arguments->setGcAllowed();
-  put(exec, argumentsPropertyName, Object(arguments), Internal|DontDelete);
+  _argumentsObject = new ArgumentsImp(exec, f, args);
+  putDirect(argumentsPropertyName, _argumentsObject, Internal|DontDelete);
 }
 
@@ -353 +345 @@
 {
   Value protect(this);
-  put(exec,lengthPropertyName,Number(len),DontDelete|ReadOnly|DontEnum);
+  putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
 }
 

trunk/JavaScriptCore/kjs/function.h

@@ -25 +25 @@
 
 #include "internal.h"
+#include "array_instance.h"
 
 namespace KJS {
@@ -91 +92 @@
 
 
-  class ArgumentsImp : public ObjectImp {
+  class ArgumentsImp : public ArrayInstanceImp {
   public:
     ArgumentsImp(ExecState *exec, FunctionImp *func, const List &args);
@@ -103 +104 @@
     ActivationImp(ExecState *exec, FunctionImp *f, const List &args);
 
-    Object argumentsObject() { return Object(arguments); }
-
     virtual const ClassInfo *classInfo() const { return &info; }
     static const ClassInfo info;
@@ -112 +111 @@
   private:
     FunctionImp *_function;
-    ObjectImp* arguments;
+    List _arguments;
+    ObjectImp *_argumentsObject;
   };
 

trunk/JavaScriptCore/kjs/function_object.cpp

@@ -41 +41 @@
 {
   Value protect(this);
-  put(exec, toStringPropertyName, Object(new FunctionProtoFuncImp(exec, this, FunctionProtoFuncImp::ToString, 0)), DontEnum);
-  put(exec, "apply",    Object(new FunctionProtoFuncImp(exec, this, FunctionProtoFuncImp::Apply,    2)), DontEnum);
-  put(exec, "call",     Object(new FunctionProtoFuncImp(exec, this, FunctionProtoFuncImp::Call,     1)), DontEnum);
+  putDirect(toStringPropertyName, new FunctionProtoFuncImp(exec, this, FunctionProtoFuncImp::ToString, 0), DontEnum);
+  static const Identifier applyPropertyName("apply");
+  putDirect(applyPropertyName,    new FunctionProtoFuncImp(exec, this, FunctionProtoFuncImp::Apply,    2), DontEnum);
+  static const Identifier callPropertyName("call");
+  putDirect(callPropertyName,     new FunctionProtoFuncImp(exec, this, FunctionProtoFuncImp::Call,     1), DontEnum);
 }
 
@@ -68 +70 @@
 {
   Value protect(this);
-  put(exec,lengthPropertyName,Number(len),DontDelete|ReadOnly|DontEnum);
+  putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
 }
 
@@ -175 +177 @@
 {
   Value protect(this);
-  put(exec,prototypePropertyName, Object(funcProto), DontEnum|DontDelete|ReadOnly);
+  putDirect(prototypePropertyName, funcProto, DontEnum|DontDelete|ReadOnly);
 
   // no. of arguments for constructor
-  put(exec,lengthPropertyName, Number(1), ReadOnly|DontDelete|DontEnum);
+  putDirect(lengthPropertyName, NumberImp::one(), ReadOnly|DontDelete|DontEnum);
 }
 
@@ -276 +278 @@
   }
 
-  fimp->put(exec,lengthPropertyName, Number(params),ReadOnly|DontDelete|DontEnum);
   List consArgs;
 
   Object objCons = exec->interpreter()->builtinObject();
   Object prototype = objCons.construct(exec,List::empty());
-  prototype.put(exec, constructorPropertyName,
-                Object(fimp), DontEnum|DontDelete|ReadOnly);
-  fimp->put(exec,prototypePropertyName,prototype,DontEnum|DontDelete|ReadOnly);
+  prototype.put(exec, constructorPropertyName, Value(fimp), DontEnum|DontDelete|ReadOnly);
+  fimp->put(exec, prototypePropertyName, prototype, DontEnum|DontDelete|ReadOnly);
   return ret;
 }

trunk/JavaScriptCore/kjs/internal.cpp

@@ -222 +222 @@
 // ------------------------------ NumberImp ------------------------------------
 
+NumberImp *NumberImp::staticNaN;
+
+ValueImp *NumberImp::create(int i)
+{
+    if (SimpleNumber::fits(i))
+        return SimpleNumber::make(i);
+    NumberImp *imp = new NumberImp(static_cast<double>(i));
+    imp->setGcAllowedFast();
+    return imp;
+}
+
+ValueImp *NumberImp::create(double d)
+{
+    if (SimpleNumber::fits(d))
+        return SimpleNumber::make((int)d);
+    if (isNaN(d))
+        return staticNaN;
+    NumberImp *imp = new NumberImp(d);
+    imp->setGcAllowedFast();
+    return imp;
+}
+
 Value NumberImp::toPrimitive(ExecState *, Type) const
 {
@@ -453 +475 @@
   BooleanImp::staticFalse = new BooleanImp(false);
   BooleanImp::staticFalse->ref();
+  NumberImp::staticNaN = new NumberImp(NaN);
+  NumberImp::staticNaN->ref();
 }
 
@@ -470 +494 @@
   BooleanImp::staticFalse->setGcAllowed();
   BooleanImp::staticFalse = 0L;
+  NumberImp::staticNaN->deref();
+  NumberImp::staticNaN->setGcAllowed();
+  NumberImp::staticNaN = 0;
 }
 
@@ -787 +814 @@
 
 InternalFunctionImp::InternalFunctionImp(FunctionPrototypeImp *funcProto)
-  : ObjectImp(Object(funcProto))
+  : ObjectImp(funcProto)
 {
 }

trunk/JavaScriptCore/kjs/internal.h

@@ -119 +119 @@
 
   class NumberImp : public ValueImp {
-  public:
-    NumberImp(double v) : val(v) { }
+    friend class Number;
+    friend class InterpreterImp;
+  public:
+    static ValueImp *create(int);
+    static ValueImp *create(double);
+    static ValueImp *zero() { return SimpleNumber::make(0); }
+    static ValueImp *one() { return SimpleNumber::make(1); }
+    static ValueImp *two() { return SimpleNumber::make(2); }
+    
     double value() const { return val; }
 
@@ -131 +138 @@
     Object toObject(ExecState *exec) const;
 
-  private:
+    static NumberImp *staticNaN;
+
+  private:
+    NumberImp(double v) : val(v) { }
+
     virtual bool toUInt32(unsigned&) const;
 

trunk/JavaScriptCore/kjs/math_object.cpp

@@ -77 +77 @@
 MathObjectImp::MathObjectImp(ExecState * /*exec*/,
                              ObjectPrototypeImp *objProto)
-  : ObjectImp(Object(objProto))
+  : ObjectImp(objProto)
 {
 }
@@ -131 +131 @@
 {
   Value protect(this);
-  put(exec,lengthPropertyName,Number(l),DontDelete|ReadOnly|DontEnum);
+  putDirect(lengthPropertyName, l, DontDelete|ReadOnly|DontEnum);
 }
 

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -229 +229 @@
       //cout << "Resolve: FOUND '" << ident.ascii() << "'"
       //     << " in " << (void*)o << " " << o->classInfo()->className << endl;
-      return Reference(Object(o), ident);
+      return Reference(o, ident);
     }
     scope++;

trunk/JavaScriptCore/kjs/number_object.cpp

@@ -51 +51 @@
 {
   Value protect(this);
-  setInternalValue(Number(0));
+  setInternalValue(NumberImp::zero());
 
   // The constructor will be added later, after NumberObjectImp has been constructed
 
-  put(exec,toStringPropertyName,       Object(new NumberProtoFuncImp(exec,funcProto,NumberProtoFuncImp::ToString,       1)), DontEnum);
-  put(exec,toLocaleStringPropertyName, Object(new NumberProtoFuncImp(exec,funcProto,NumberProtoFuncImp::ToLocaleString, 0)), DontEnum);
-  put(exec,valueOfPropertyName,        Object(new NumberProtoFuncImp(exec,funcProto,NumberProtoFuncImp::ValueOf,        0)), DontEnum);
+  putDirect(toStringPropertyName,       new NumberProtoFuncImp(exec,funcProto,NumberProtoFuncImp::ToString,       1), DontEnum);
+  putDirect(toLocaleStringPropertyName, new NumberProtoFuncImp(exec,funcProto,NumberProtoFuncImp::ToLocaleString, 0), DontEnum);
+  putDirect(valueOfPropertyName,        new NumberProtoFuncImp(exec,funcProto,NumberProtoFuncImp::ValueOf,        0), DontEnum);
 }
 
@@ -68 +68 @@
 {
   Value protect(this);
-  put(exec,lengthPropertyName,Number(len),DontDelete|ReadOnly|DontEnum);
+  putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
 }
 
@@ -125 +125 @@
   Value protect(this);
   // Number.Prototype
-  put(exec,prototypePropertyName, Value(numberProto),DontEnum|DontDelete|ReadOnly);
+  putDirect(prototypePropertyName, numberProto,DontEnum|DontDelete|ReadOnly);
 
   // no. of arguments for constructor
-  put(exec,lengthPropertyName, Number(1), ReadOnly|DontDelete|DontEnum);
+  putDirect(lengthPropertyName, NumberImp::one(), ReadOnly|DontDelete|DontEnum);
 }
 

trunk/JavaScriptCore/kjs/object.cpp

@@ -59 +59 @@
 }
 
+ObjectImp::ObjectImp(ObjectImp *proto)
+  : _proto(proto), _internalValue(0L), _scope(true)
+{
+  //fprintf(stderr,"ObjectImp::ObjectImp %p\n",(void*)this);
+}
+
 ObjectImp::ObjectImp() :
   _scope(true)
@@ -153 +159 @@
 }
 
-// This get method only looks at the property map.
-// A bit like hasProperty(recursive=false), this doesn't go to the prototype.
-// This is used e.g. by lookupOrCreateFunction (to cache a function, we don't want
-// to look up in the prototype, it might already exist there)
-ValueImp* ObjectImp::getDirect(const Identifier& propertyName) const
-{
-  return _prop.get(propertyName);
-}
-
 // ECMA 8.6.2.2
 void ObjectImp::put(ExecState *exec, const Identifier &propertyName,
@@ -168 +165 @@
   assert(!value.isNull());
   assert(value.type() != ListType);
+
+  // non-standard netscape extension
+  if (propertyName == specialPrototypePropertyName) {
+    setPrototype(value);
+    return;
+  }
 
   /* TODO: check for write permissions directly w/o this call */
@@ -178 +181 @@
     fprintf( stderr, "WARNING: canPut %s said NO\n", propertyName.ascii() );
 #endif
-    return;
-  }
-
-  // non-standard netscape extension
-  if (propertyName == specialPrototypePropertyName) {
-    setPrototype(value);
     return;
   }
@@ -395 +392 @@
       for (int i = 0; i < size; ++i, ++e) {
         if ( e->s && !(e->attr & DontEnum) )
-          list.append(Reference(Object(this), e->s)); /// ######### check for duplicates with the propertymap
+          list.append(Reference(this, e->s)); /// ######### check for duplicates with the propertymap
       }
     }
@@ -412 +409 @@
 {
   _internalValue = v.imp();
+}
+
+void ObjectImp::setInternalValue(ValueImp *v)
+{
+  v->setGcAllowed();
+  _internalValue = v;
 }
 
@@ -445 +448 @@
 }
 
+void ObjectImp::putDirect(const Identifier &propertyName, ValueImp *value, int attr)
+{
+    value->setGcAllowed();
+    _prop.put(propertyName, value, attr);
+}
+
+void ObjectImp::putDirect(const Identifier &propertyName, int value, int attr)
+{
+    _prop.put(propertyName, NumberImp::create(value), attr);
+}
 
 // ------------------------------ Error ----------------------------------------

trunk/JavaScriptCore/kjs/object.h

@@ -370 +370 @@
      */
     ObjectImp(const Object &proto);
+    ObjectImp(ObjectImp *proto);
 
     /**
@@ -525 +526 @@
      * It's simply a quick way to remove everything before destroying.
      */
-    void deleteAllProperties( ExecState * );
+    void deleteAllProperties(ExecState *);
 
     /**
@@ -572 +573 @@
     Value internalValue() const;
     void setInternalValue(const Value &v);
+    void setInternalValue(ValueImp *v);
 
     Value toPrimitive(ExecState *exec,
@@ -580 +582 @@
     Object toObject(ExecState *exec) const;
 
-    ValueImp* getDirect(const Identifier& propertyName) const;
+    // This get method only looks at the property map.
+    // A bit like hasProperty(recursive=false), this doesn't go to the prototype.
+    // This is used e.g. by lookupOrCreateFunction (to cache a function, we don't want
+    // to look up in the prototype, it might already exist there)
+    ValueImp *getDirect(const Identifier& propertyName) const
+        { return _prop.get(propertyName); }
+    void putDirect(const Identifier &propertyName, ValueImp *value, int attr = 0);
+    void putDirect(const Identifier &propertyName, int value, int attr = 0);
+
   private:
     const HashEntry* findPropertyHashEntry( const Identifier& propertyName ) const;

trunk/JavaScriptCore/kjs/object_object.cpp

@@ -39 +39 @@
 {
   Value protect(this);
-  put(exec,toStringPropertyName, Object(new ObjectProtoFuncImp(exec,funcProto,ObjectProtoFuncImp::ToString, 0)), DontEnum);
-  put(exec,valueOfPropertyName,  Object(new ObjectProtoFuncImp(exec,funcProto,ObjectProtoFuncImp::ValueOf,  0)), DontEnum);
+  putDirect(toStringPropertyName, new ObjectProtoFuncImp(exec,funcProto,ObjectProtoFuncImp::ToString, 0), DontEnum);
+  putDirect(valueOfPropertyName,  new ObjectProtoFuncImp(exec,funcProto,ObjectProtoFuncImp::ValueOf,  0), DontEnum);
 }
 
@@ -52 +52 @@
 {
   Value protect(this);
-  put(exec,lengthPropertyName,Number(len),DontDelete|ReadOnly|DontEnum);
+  putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
 }
 
@@ -80 +80 @@
   Value protect(this);
   // ECMA 15.2.3.1
-  put(exec,prototypePropertyName, Object(objProto), DontEnum|DontDelete|ReadOnly);
+  putDirect(prototypePropertyName, objProto, DontEnum|DontDelete|ReadOnly);
 
   // no. of arguments for constructor
-  put(exec,lengthPropertyName, Number(1), ReadOnly|DontDelete|DontEnum);
+  putDirect(lengthPropertyName, NumberImp::one(), ReadOnly|DontDelete|DontEnum);
 }
 

trunk/JavaScriptCore/kjs/property_map.cpp

@@ -127 +127 @@
 {
     UString::Rep *rep = name._ustring.rep;
-
+    
 #if USE_SINGLE_ENTRY
     if (!_table) {

trunk/JavaScriptCore/kjs/reference.cpp

@@ -37 +37 @@
 
 Reference::Reference(const Object& b, unsigned p)
+  : base(b),
+    propertyNameAsNumber(p),
+    baseIsValue(false),
+    propertyNameIsNumber(true)
+{
+}
+
+Reference::Reference(ObjectImp *b, const Identifier& p)
+  : base(b),
+    baseIsValue(false),
+    propertyNameIsNumber(false),
+    prop(p)
+{
+}
+
+Reference::Reference(ObjectImp *b, unsigned p)
   : base(b),
     propertyNameAsNumber(p),

trunk/JavaScriptCore/kjs/reference.h

@@ -35 +35 @@
     Reference(const Object& b, const Identifier& p);
     Reference(const Object& b, unsigned p);
+    Reference(ObjectImp *b, const Identifier& p);
+    Reference(ObjectImp *b, unsigned p);
     Reference(const Null& b, const Identifier& p);
     Reference(const Null& b, unsigned p);

trunk/JavaScriptCore/kjs/regexp_object.cpp

@@ -41 +41 @@
                                        ObjectPrototypeImp *objProto,
                                        FunctionPrototypeImp *funcProto)
-  : ObjectImp(Object(objProto))
+  : ObjectImp(objProto)
 {
   Value protect(this);
@@ -48 +48 @@
   // The constructor will be added later in RegExpObject's constructor (?)
 
-  put(exec, "exec",     Object(new RegExpProtoFuncImp(exec,funcProto,RegExpProtoFuncImp::Exec,     0)), DontEnum);
-  put(exec, "test",     Object(new RegExpProtoFuncImp(exec,funcProto,RegExpProtoFuncImp::Test,     0)), DontEnum);
-  put(exec, toStringPropertyName, Object(new RegExpProtoFuncImp(exec,funcProto,RegExpProtoFuncImp::ToString, 0)), DontEnum);
+  static const Identifier execPropertyName("exec");
+  putDirect(execPropertyName,     new RegExpProtoFuncImp(exec,funcProto,RegExpProtoFuncImp::Exec,     0), DontEnum);
+  static const Identifier testPropertyName("test");
+  putDirect(testPropertyName,     new RegExpProtoFuncImp(exec,funcProto,RegExpProtoFuncImp::Test,     0), DontEnum);
+  putDirect(toStringPropertyName, new RegExpProtoFuncImp(exec,funcProto,RegExpProtoFuncImp::ToString, 0), DontEnum);
 }
 
@@ -60 +62 @@
 {
   Value protect(this);
-  put(exec,lengthPropertyName,Number(len),DontDelete|ReadOnly|DontEnum);
+  putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
 }
 
@@ -138 +140 @@
 
 RegExpImp::RegExpImp(RegExpPrototypeImp *regexpProto)
-  : ObjectImp(Object(regexpProto)), reg(0L)
+  : ObjectImp(regexpProto), reg(0L)
 {
 }
@@ -157 +159 @@
   Value protect(this);
   // ECMA 15.10.5.1 RegExp.prototype
-  put(exec,prototypePropertyName, Object(regProto), DontEnum|DontDelete|ReadOnly);
+  putDirect(prototypePropertyName, regProto, DontEnum|DontDelete|ReadOnly);
 
   // no. of arguments for constructor
-  put(exec,lengthPropertyName, Number(2), ReadOnly|DontDelete|DontEnum);
+  putDirect(lengthPropertyName, NumberImp::two(), ReadOnly|DontDelete|DontEnum);
 }
 
@@ -222 +224 @@
 Object RegExpObjectImp::construct(ExecState *exec, const List &args)
 {
-  String p = args.isEmpty() ? UString("") : args[0].toString(exec);
+  UString p = args.isEmpty() ? UString("") : args[0].toString(exec);
   UString flags = args[1].toString(exec);
 
@@ -234 +236 @@
   // TODO: throw a syntax error on invalid flags
 
-  dat->put(exec, "global", Boolean(global));
-  dat->put(exec, "ignoreCase", Boolean(ignoreCase));
-  dat->put(exec, "multiline", Boolean(multiline));
-
-  dat->put(exec, "source", p);
-  dat->put(exec, "lastIndex", Number(0), DontDelete | DontEnum);
+  dat->putDirect("global", global ? BooleanImp::staticTrue : BooleanImp::staticFalse);
+  dat->putDirect("ignoreCase", ignoreCase ? BooleanImp::staticTrue : BooleanImp::staticFalse);
+  dat->putDirect("multiline", multiline ? BooleanImp::staticTrue : BooleanImp::staticFalse);
+
+  dat->putDirect("source", new StringImp(p));
+  dat->putDirect("lastIndex", NumberImp::zero(), DontDelete | DontEnum);
 
   int reflags = RegExp::None;
@@ -248 +250 @@
   if (multiline)
       reflags |= RegExp::Multiline;
-  dat->setRegExp(new RegExp(p.value(), reflags));
+  dat->setRegExp(new RegExp(p, reflags));
 
   return obj;

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -38 +38 @@
 const ClassInfo StringInstanceImp::info = {"String", 0, 0, 0};
 
-StringInstanceImp::StringInstanceImp(const Object &proto)
+StringInstanceImp::StringInstanceImp(ObjectImp *proto)
   : ObjectImp(proto)
 {
@@ -44 +44 @@
 }
 
-StringInstanceImp::StringInstanceImp(const Object &proto, const UString &string)
+StringInstanceImp::StringInstanceImp(ObjectImp *proto, const UString &string)
   : ObjectImp(proto)
 {
@@ -120 +120 @@
 StringPrototypeImp::StringPrototypeImp(ExecState *exec,
                                        ObjectPrototypeImp *objProto)
-  : StringInstanceImp(Object(objProto))
+  : StringInstanceImp(objProto)
 {
   Value protect(this);
   // The constructor will be added later, after StringObjectImp has been built
-  put(exec,lengthPropertyName,Number(0),DontDelete|ReadOnly|DontEnum);
+  putDirect(lengthPropertyName, NumberImp::zero(), DontDelete|ReadOnly|DontEnum);
 
 }
@@ -141 +141 @@
 {
   Value protect(this);
-  put(exec,lengthPropertyName,Number(len),DontDelete|ReadOnly|DontEnum);
+  putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
 }
 
@@ -532 +532 @@
   Value protect(this);
   // ECMA 15.5.3.1 String.prototype
-  put(exec,prototypePropertyName, Object(stringProto), DontEnum|DontDelete|ReadOnly);
+  putDirect(prototypePropertyName, stringProto, DontEnum|DontDelete|ReadOnly);
 
   static Identifier fromCharCode("fromCharCode");
-  put(exec,fromCharCode, Object(new StringObjectFuncImp(exec,funcProto)), DontEnum);
+  putDirect(fromCharCode, new StringObjectFuncImp(exec,funcProto), DontEnum);
 
   // no. of arguments for constructor
-  put(exec,lengthPropertyName, Number(1), ReadOnly|DontDelete|DontEnum);
+  putDirect(lengthPropertyName, NumberImp::one(), ReadOnly|DontDelete|DontEnum);
 }
 
@@ -550 +550 @@
 Object StringObjectImp::construct(ExecState *exec, const List &args)
 {
-  Object proto = exec->interpreter()->builtinStringPrototype();
+  ObjectImp *proto = exec->interpreter()->builtinStringPrototype().imp();
   if (args.size() == 0)
     return Object(new StringInstanceImp(proto));
@@ -579 +579 @@
 {
   Value protect(this);
-  put(exec,lengthPropertyName,Number(1),DontDelete|ReadOnly|DontEnum);
+  putDirect(lengthPropertyName, NumberImp::one(), DontDelete|ReadOnly|DontEnum);
 }
 

trunk/JavaScriptCore/kjs/string_object.h

@@ -30 +30 @@
   class StringInstanceImp : public ObjectImp {
   public:
-    StringInstanceImp(const Object &proto);
-    StringInstanceImp(const Object &proto, const UString &string);
+    StringInstanceImp(ObjectImp *proto);
+    StringInstanceImp(ObjectImp *proto, const UString &string);
 
     virtual Value get(ExecState *exec, const Identifier &propertyName) const;

trunk/JavaScriptCore/kjs/value.cpp

@@ -203 +203 @@
 {
   rep = v;
-  if (rep)
+  if (v)
   {
-    rep->ref();
+    v->ref();
     //fprintf(stderr, "Value::Value(%p) imp=%p ref=%d\n", this, rep, rep->refcount);
     v->setGcAllowed();
@@ -296 +296 @@
 // ------------------------------ String ---------------------------------------
 
-String::String(const UString &s) : Value(new StringImp(UString(s)))
+String::String(const UString &s) : Value(new StringImp(s))
 {
 }
@@ -323 +323 @@
 
 Number::Number(double d)
-  : Value(SimpleNumber::fits(d) ? SimpleNumber::make((long)d) : new NumberImp(d)) { }
+  : Value(SimpleNumber::fits(d) ? SimpleNumber::make((long)d) : (KJS::isNaN(d) ? NumberImp::staticNaN : new NumberImp(d))) { }
 
 Number::Number(long int l)
@@ -349 +349 @@
 int Number::intValue() const
 {
-  return int(value());
+  if (SimpleNumber::is(rep))
+    return SimpleNumber::value(rep);
+  return (int)((NumberImp*)rep)->value();
 }
 
 bool Number::isNaN() const
 {
-  return KJS::isNaN(value());
+  return rep == NumberImp::staticNaN;
 }
 
 bool Number::isInf() const
 {
-  return KJS::isInf(value());
-}
+  if (SimpleNumber::is(rep))
+    return false;
+  return KJS::isInf(((NumberImp*)rep)->value());
+}

trunk/JavaScriptCore/kjs/value.h

@@ -109 +109 @@
      */
     void setGcAllowed();
+    
+    // Will crash if called on a simple number.
+    void setGcAllowedFast() { _flags |= VI_GCALLOWED; }
 
     int toInteger(ExecState *exec) const;