JavaScriptCore-903.tar.gz

[apple/javascriptcore.git] / runtime / InternalFunction.cpp

diff --git a/runtime/InternalFunction.cpp b/runtime/InternalFunction.cpp
index b5c95715592edd5a298439d5a91b5beccd617541..c3b07f8297028e96f2ff503d95178f1ccf98f6ae 100644 (file)
--- a/runtime/InternalFunction.cpp
+++ b/runtime/InternalFunction.cpp
@@ -24,48 +24,53 @@
 #include "InternalFunction.h"
 
 #include "FunctionPrototype.h"
 #include "InternalFunction.h"
 
 #include "FunctionPrototype.h"

+#include "JSGlobalObject.h"

 #include "JSString.h"
 
 namespace JSC {
 
 #include "JSString.h"
 
 namespace JSC {
 

+// Ensure the compiler generates a vtable for InternalFunction!
+void InternalFunction::vtableAnchor() {}
+

 ASSERT_CLASS_FITS_IN_CELL(InternalFunction);
 
 ASSERT_CLASS_FITS_IN_CELL(InternalFunction);
 

-const ClassInfo InternalFunction::info = { "Function", 0, 0, 0 };
+const ClassInfo InternalFunction::s_info = { "Function", &JSObjectWithGlobalObject::s_info, 0, 0 };

 
 

-const ClassInfo* InternalFunction::classInfo() const
+InternalFunction::InternalFunction(VPtrStealingHackType)
+    : JSObjectWithGlobalObject(VPtrStealingHack)

 {
 {

-    return &info;

 }
 
 }
 

-InternalFunction::InternalFunction(JSGlobalData* globalData, PassRefPtr<Structure> structure, const Identifier& name)
-    : JSObject(structure)
+InternalFunction::InternalFunction(JSGlobalData* globalData, JSGlobalObject* globalObject, Structure* structure, const Identifier& name)
+    : JSObjectWithGlobalObject(globalObject, structure)

 {
 {

-    putDirect(globalData->propertyNames->name, jsString(globalData, name.ustring()), DontDelete | ReadOnly | DontEnum);
+    ASSERT(inherits(&s_info));
+    putDirect(*globalData, globalData->propertyNames->name, jsString(globalData, name.isNull() ? "" : name.ustring()), DontDelete | ReadOnly | DontEnum);

 }
 
 }
 

-const UString& InternalFunction::name(JSGlobalData* globalData)
+const UString& InternalFunction::name(ExecState* exec)

 {
 {

-    return asString(getDirect(globalData->propertyNames->name))->value();
+    return asString(getDirect(exec->globalData(), exec->globalData().propertyNames->name))->tryGetValue();

 }
 
 }
 

-const UString InternalFunction::displayName(JSGlobalData* globalData)
+const UString InternalFunction::displayName(ExecState* exec)

 {
 {

-    JSValue displayName = getDirect(globalData->propertyNames->displayName);
+    JSValue displayName = getDirect(exec->globalData(), exec->globalData().propertyNames->displayName);

     
     

-    if (displayName && isJSString(globalData, displayName))
-        return asString(displayName)->value();
+    if (displayName && isJSString(&exec->globalData(), displayName))
+        return asString(displayName)->tryGetValue();

     
     

-    return UString::null();
+    return UString();

 }
 
 }
 

-const UString InternalFunction::calculatedDisplayName(JSGlobalData* globalData)
+const UString InternalFunction::calculatedDisplayName(ExecState* exec)

 {
 {

-    const UString explicitName = displayName(globalData);
+    const UString explicitName = displayName(exec);

     
     if (!explicitName.isEmpty())
         return explicitName;
     
     
     if (!explicitName.isEmpty())
         return explicitName;
     

-    return name(globalData);
+    return name(exec);

 }
 
 } // namespace JSC
 }
 
 } // namespace JSC