JavaScriptCore-7600.1.4.15.12.tar.gz

[apple/javascriptcore.git] / runtime / BatchedTransitionOptimizer.h

diff --git a/runtime/BatchedTransitionOptimizer.h b/runtime/BatchedTransitionOptimizer.h
index 8a954af1dbfafc4b01317635c35208868631a2bc..951a3286cb6a9253b9771ca97b307fbd5e022639 100644 (file)
--- a/runtime/BatchedTransitionOptimizer.h
+++ b/runtime/BatchedTransitionOptimizer.h
@@ -11,10 +11,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *

- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY

  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR

  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR


@@ -27,28 +27,31 @@
 #ifndef BatchedTransitionOptimizer_h
 #define BatchedTransitionOptimizer_h
 
 #ifndef BatchedTransitionOptimizer_h
 #define BatchedTransitionOptimizer_h
 

-#include <wtf/Noncopyable.h>

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

-    class BatchedTransitionOptimizer : Noncopyable {
-    public:
-        BatchedTransitionOptimizer(JSObject* object)
-            : m_object(object)
-        {
-            if (!m_object->structure()->isDictionary())
-                m_object->setStructure(Structure::toCacheableDictionaryTransition(m_object->structure()));
-        }
-
-        ~BatchedTransitionOptimizer()
-        {
-            m_object->flattenDictionaryObject();
-        }
-
-    private:
-        JSObject* m_object;
-    };
+class BatchedTransitionOptimizer {
+    WTF_MAKE_NONCOPYABLE(BatchedTransitionOptimizer);
+public:
+    BatchedTransitionOptimizer(VM& vm, JSObject* object)
+        : m_vm(&vm)
+        , m_object(object)
+    {
+        if (!m_object->structure(vm)->isDictionary())
+            m_object->convertToDictionary(vm);
+    }
+
+    ~BatchedTransitionOptimizer()
+    {
+        if (m_object->structure()->isDictionary())
+            m_object->flattenDictionaryObject(*m_vm);
+    }
+
+private:
+    VM* m_vm;
+    JSObject* m_object;
+};

 
 } // namespace JSC
 
 
 } // namespace JSC