JSCell::classInfo() belongs in JSCellInlines.h.
authormark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 31 Jul 2014 21:56:38 +0000 (21:56 +0000)
committermark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 31 Jul 2014 21:56:38 +0000 (21:56 +0000)
<https://webkit.org/b/135475>

Reviewed by Mark Hahnenberg.

* runtime/JSCellInlines.h:
(JSC::JSCell::classInfo):
* runtime/JSDestructibleObject.h:
(JSC::JSCell::classInfo): Deleted.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@171888 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/runtime/JSCellInlines.h
Source/JavaScriptCore/runtime/JSDestructibleObject.h

index 0f4e391c3dbd90a915f3fc70dc8d6a6c9c4f5dfe..ade996ec38e9387d5a86a3e4f5cec38499a5b10d 100644 (file)
@@ -1,3 +1,15 @@
+2014-07-31  Mark Lam  <mark.lam@apple.com>
+
+        JSCell::classInfo() belongs in JSCellInlines.h.
+        <https://webkit.org/b/135475>
+
+        Reviewed by Mark Hahnenberg.
+
+        * runtime/JSCellInlines.h:
+        (JSC::JSCell::classInfo):
+        * runtime/JSDestructibleObject.h:
+        (JSC::JSCell::classInfo): Deleted.
+
 2014-07-31  Tanay C  <tanay.c@samsung.com>
 
         Build warning in webkit/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
index ed111c655e59fe079515545c95e0b0066504fd5e..8ea73f3e685358bd4ea173dc95d2505b35d3c446 100644 (file)
@@ -30,6 +30,7 @@
 #include "DeferGC.h"
 #include "Handle.h"
 #include "JSCell.h"
+#include "JSDestructibleObject.h"
 #include "JSObject.h"
 #include "JSString.h"
 #include "Structure.h"
@@ -231,6 +232,14 @@ inline bool JSCell::canUseFastGetOwnProperty(const Structure& structure)
         && !structure.typeInfo().overridesGetOwnPropertySlot();
 }
 
+inline const ClassInfo* JSCell::classInfo() const
+{
+    MarkedBlock* block = MarkedBlock::blockFor(this);
+    if (block->destructorType() == MarkedBlock::Normal)
+        return static_cast<const JSDestructibleObject*>(this)->classInfo();
+    return structure(*block->vm())->classInfo();
+}
+
 inline bool JSCell::toBoolean(ExecState* exec) const
 {
     if (isString()) 
index f10fbabc7c4695faa0b9a019d573fe2d7c84d87c..d687b84201783cab23e10c31d2186b16d2339707 100644 (file)
@@ -29,14 +29,6 @@ private:
     const ClassInfo* m_classInfo;
 };
 
-inline const ClassInfo* JSCell::classInfo() const
-{
-    MarkedBlock* block = MarkedBlock::blockFor(this);
-    if (block->destructorType() == MarkedBlock::Normal)
-        return static_cast<const JSDestructibleObject*>(this)->classInfo();
-    return structure(*block->vm())->classInfo();
-}
-
 } // namespace JSC
 
 #endif