2011-04-15 Michael Saboff <msaboff@apple.com>

msaboff · msaboff · commit d38703674290 · 2011-04-15T20:51:24.000Z
Reviewed by Oliver Hunt. globalObject moved to JSObjectWithGlobalObject.cpp inhibits inlining https://bugs.webkit.org/show_bug.cgi?id=58677 Moved JSObjectWithGlobalObject::globalObject() to runtime/JSObjectWithGlobalObject.h to allow the compiler to inline it for a performance benefit. An equivalent instance had been in a header file before r60057. * JavaScriptCore.exp: * runtime/JSObjectWithGlobalObject.cpp: * runtime/JSObjectWithGlobalObject.h: (JSC::JSObjectWithGlobalObject::globalObject): Canonical link: https://commits.webkit.org/73772@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@84030 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,20 @@
+2011-04-15  Michael Saboff  <msaboff@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        globalObject moved to JSObjectWithGlobalObject.cpp inhibits inlining
+        https://bugs.webkit.org/show_bug.cgi?id=58677
+
+        Moved JSObjectWithGlobalObject::globalObject() to 
+        runtime/JSObjectWithGlobalObject.h to allow the compiler to inline
+        it for a performance benefit.  An equivalent instance had been in
+        a header file before r60057.
+
+        * JavaScriptCore.exp:
+        * runtime/JSObjectWithGlobalObject.cpp:
+        * runtime/JSObjectWithGlobalObject.h:
+        (JSC::JSObjectWithGlobalObject::globalObject):
+
 2011-04-14  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Geoffrey Garen.
diff --git a/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig b/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
@@ -49,5 +49,6 @@ PRODUCT_NAME = JavaScriptCore;
 OTHER_CFLAGS = $(OTHER_CFLAGS_$(CONFIGURATION)_$(CURRENT_VARIANT));
 OTHER_CFLAGS_Release_normal = $(OTHER_CFLAGS_normal_$(TARGET_GCC_VERSION));
 OTHER_CFLAGS_Production_normal = $(OTHER_CFLAGS_normal_$(TARGET_GCC_VERSION));
-OTHER_CFLAGS_normal_GCC_42 = -fomit-frame-pointer -funwind-tables;
+// OTHER_CFLAGS_normal_GCC_42 = -fomit-frame-pointer -funwind-tables;
+OTHER_CFLAGS_normal_GCC_42 = -funwind-tables;
 OTHER_CFLAGS_normal_LLVM_GCC_42 = $(OTHER_CFLAGS_normal_GCC_42);
diff --git a/Source/JavaScriptCore/runtime/JSObjectWithGlobalObject.cpp b/Source/JavaScriptCore/runtime/JSObjectWithGlobalObject.cpp
@@ -41,9 +41,4 @@ JSObjectWithGlobalObject::JSObjectWithGlobalObject(JSGlobalObject* globalObject,
         putAnonymousValue(globalObject->globalData(), GlobalObjectSlot, globalObject);
 }
 
-JSGlobalObject* JSObjectWithGlobalObject::globalObject() const
-{
-    return asGlobalObject((getAnonymousValue(GlobalObjectSlot).asCell()));
-}
-
 } // namespace JSC
diff --git a/Source/JavaScriptCore/runtime/JSObjectWithGlobalObject.h b/Source/JavaScriptCore/runtime/JSObjectWithGlobalObject.h
@@ -26,7 +26,7 @@
 #ifndef JSObjectWithGlobalObject_h
 #define JSObjectWithGlobalObject_h
 
-#include "JSObject.h"
+#include "JSGlobalObject.h"
 
 namespace JSC {
 
@@ -39,7 +39,10 @@ class JSObjectWithGlobalObject : public JSNonFinalObject {
         return Structure::create(globalData, proto, TypeInfo(ObjectType, StructureFlags), AnonymousSlotCount, &s_info);
     }
 
-    JSGlobalObject* globalObject() const;
+    JSGlobalObject* globalObject() const
+    {
+        return asGlobalObject((getAnonymousValue(GlobalObjectSlot).asCell()));
+    }
 
 protected:
     JSObjectWithGlobalObject(JSGlobalObject*, NonNullPassRefPtr<Structure>);

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,4 @@ JSObjectWithGlobalObject::JSObjectWithGlobalObject(JSGlobalObject* globalObject,`
`41`	`41`	`putAnonymousValue(globalObject->globalData(), GlobalObjectSlot, globalObject);`
`42`	`42`	`}`
`43`	`43`
`44`		`-JSGlobalObject* JSObjectWithGlobalObject::globalObject() const`
`45`		`-{`
`46`		`- return asGlobalObject((getAnonymousValue(GlobalObjectSlot).asCell()));`
`47`		`-}`
`48`		`-`
`49`	`44`	`} // namespace JSC`