Changeset 33038 in webkit for trunk/JavaScriptCore/kjs/value.cpp

Timestamp:

May 12, 2008, 12:12:31 AM (17 years ago)

Author:

[email protected]

Message:

Roll out recent threading changes (r32807, r32810, r32819, r32822) to simplify
SquirrelFish merging.

File:

• trunk/JavaScriptCore/kjs/value.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/value.cpp

@@ -81 +81 @@
 static const double D32 = 4294967296.0;
 
-void* JSCell::operator new(size_t size, ExecState* exec)
-{
-    return exec->heap()->allocate(size);
+void *JSCell::operator new(size_t size)
+{
+    return Collector::allocate(size);
 }
 
@@ -208 +208 @@
 }
 
-JSCell* jsString(ExecState* exec, const char* s)
-{
-    return new (exec) StringImp(s ? s : "");
-}
-
-JSCell* jsString(ExecState* exec, const UString& s)
-{
-    return s.isNull() ? new (exec) StringImp("") : new (exec) StringImp(s);
-}
-
-JSCell* jsOwnedString(ExecState* exec, const UString& s)
-{
-    return s.isNull() ? new (exec) StringImp("", StringImp::HasOtherOwner) : new (exec) StringImp(s, StringImp::HasOtherOwner);
+JSCell* jsString(const char* s)
+{
+    return new StringImp(s ? s : "");
+}
+
+JSCell* jsString(const UString& s)
+{
+    return s.isNull() ? new StringImp("") : new StringImp(s);
+}
+
+JSCell* jsOwnedString(const UString& s)
+{
+    return s.isNull() ? new StringImp("", StringImp::HasOtherOwner) : new StringImp(s, StringImp::HasOtherOwner);
 }
 
 // This method includes a PIC branch to set up the NumberImp's vtable, so we quarantine
 // it in a separate function to keep the normal case speedy.
-JSValue* jsNumberCell(ExecState* exec, double d)
-{
-    return new (exec) NumberImp(d);
+JSValue *jsNumberCell(double d)
+{
+    return new NumberImp(d);
 }