JavaScriptCore-7601.1.46.3.tar.gz

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

diff --git a/runtime/JSWrapperObject.cpp b/runtime/JSWrapperObject.cpp
index f8f5727d82cd67696226818eee790d9cd42d12aa..b6fadadb05d220277d5aa412a5c605cbfad97571 100644 (file)
--- a/runtime/JSWrapperObject.cpp
+++ b/runtime/JSWrapperObject.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2006 Maks Orlovich
 /*
  *  Copyright (C) 2006 Maks Orlovich

- *  Copyright (C) 2006, 2009 Apple, Inc.
+ *  Copyright (C) 2006, 2009, 2012 Apple, Inc.

  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public


@@ -22,20 +22,18 @@
 #include "config.h"
 #include "JSWrapperObject.h"
 
 #include "config.h"
 #include "JSWrapperObject.h"
 

+#include "JSCInlines.h"
+

 namespace JSC {
 
 namespace JSC {
 

-ASSERT_CLASS_FITS_IN_CELL(JSWrapperObject);
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSWrapperObject);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSWrapperObject);

 
 void JSWrapperObject::visitChildren(JSCell* cell, SlotVisitor& visitor)
 {
     JSWrapperObject* thisObject = jsCast<JSWrapperObject*>(cell);
 
 void JSWrapperObject::visitChildren(JSCell* cell, SlotVisitor& visitor)
 {
     JSWrapperObject* thisObject = jsCast<JSWrapperObject*>(cell);

-    ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info);
-    COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
-    ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
+    ASSERT_GC_OBJECT_INHERITS(thisObject, info());

     JSObject::visitChildren(thisObject, visitor);
     JSObject::visitChildren(thisObject, visitor);

-    if (thisObject->m_internalValue)
-        visitor.append(&thisObject->m_internalValue);
+    visitor.append(&thisObject->m_internalValue);

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