Changeset 155143 in webkit for trunk/Source/JavaScriptCore/runtime

Timestamp:

Sep 5, 2013, 1:12:23 PM (12 years ago)

Author:

[email protected]

Message:

GCAssertions.h should use STL type traits and static_assert
​https://bugs.webkit.org/show_bug.cgi?id=120785

Reviewed by Andreas Kling.

Source/JavaScriptCore:

There's no need to rely on compiler specific support to figure out if a class is trivially destructable,
we can just use type traits from STL. Do this, fix the assert macro to use static_assert directly and
rename it from ASSERT_HAS_TRIVIAL_DESTRUCTOR to STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE to clarify that
it's a static assert and to match the STL nomenclature.

• API/JSCallbackFunction.cpp:
• debugger/DebuggerActivation.cpp:
• heap/GCAssertions.h:
• runtime/ArrayConstructor.cpp:
• runtime/BooleanConstructor.cpp:
• runtime/BooleanObject.cpp:
• runtime/BooleanPrototype.cpp:
• runtime/DateConstructor.cpp:
• runtime/ErrorConstructor.cpp:
• runtime/ErrorInstance.cpp:
• runtime/ErrorPrototype.cpp:
• runtime/ExceptionHelpers.cpp:
• runtime/FunctionConstructor.cpp:
• runtime/FunctionPrototype.cpp:
• runtime/GetterSetter.cpp:
• runtime/InternalFunction.cpp:
• runtime/JSAPIValueWrapper.cpp:
• runtime/JSArray.cpp:
• runtime/JSCell.cpp:
• runtime/JSNotAnObject.cpp:
• runtime/JSONObject.cpp:
• runtime/JSObject.cpp:
• runtime/JSPromiseConstructor.cpp:
• runtime/JSPromisePrototype.cpp:
• runtime/JSPromiseResolverConstructor.cpp:
• runtime/JSPromiseResolverPrototype.cpp:
• runtime/JSProxy.cpp:
• runtime/JSScope.cpp:
• runtime/JSWrapperObject.cpp:
• runtime/MathObject.cpp:
• runtime/NameConstructor.cpp:
• runtime/NativeErrorConstructor.cpp:
• runtime/NumberConstructor.cpp:
• runtime/NumberObject.cpp:
• runtime/NumberPrototype.cpp:
• runtime/ObjectConstructor.cpp:
• runtime/ObjectPrototype.cpp:
• runtime/RegExpObject.cpp:
• runtime/StrictEvalActivation.cpp:
• runtime/StringConstructor.cpp:
• runtime/StringObject.cpp:
• runtime/StringPrototype.cpp:

Source/WebCore:

Update for JavaScriptCore changes.

• bindings/js/JSDOMBinding.cpp:
• bindings/js/JSImageConstructor.cpp:

Source/WebKit2:

Update for JavaScriptCore changes.

• WebProcess/Plugins/Netscape/JSNPMethod.cpp:

Location:

trunk/Source/JavaScriptCore/runtime

Files:

• ArrayConstructor.cpp (modified) (1 diff)
• BooleanConstructor.cpp (modified) (1 diff)
• BooleanObject.cpp (modified) (1 diff)
• BooleanPrototype.cpp (modified) (1 diff)
• DateConstructor.cpp (modified) (1 diff)
• ErrorConstructor.cpp (modified) (1 diff)
• ErrorInstance.cpp (modified) (1 diff)
• ErrorPrototype.cpp (modified) (1 diff)
• ExceptionHelpers.cpp (modified) (1 diff)
• FunctionConstructor.cpp (modified) (1 diff)
• FunctionPrototype.cpp (modified) (1 diff)
• GetterSetter.cpp (modified) (1 diff)
• InternalFunction.cpp (modified) (1 diff)
• JSAPIValueWrapper.cpp (modified) (1 diff)
• JSArray.cpp (modified) (1 diff)
• JSCell.cpp (modified) (1 diff)
• JSNotAnObject.cpp (modified) (1 diff)
• JSONObject.cpp (modified) (1 diff)
• JSObject.cpp (modified) (1 diff)
• JSPromiseConstructor.cpp (modified) (1 diff)
• JSPromisePrototype.cpp (modified) (1 diff)
• JSPromiseResolverConstructor.cpp (modified) (1 diff)
• JSPromiseResolverPrototype.cpp (modified) (1 diff)
• JSProxy.cpp (modified) (1 diff)
• JSScope.cpp (modified) (1 diff)
• JSWrapperObject.cpp (modified) (1 diff)
• MathObject.cpp (modified) (1 diff)
• NameConstructor.cpp (modified) (1 diff)
• NativeErrorConstructor.cpp (modified) (1 diff)
• NumberConstructor.cpp (modified) (1 diff)
• NumberObject.cpp (modified) (1 diff)
• NumberPrototype.cpp (modified) (1 diff)
• ObjectConstructor.cpp (modified) (1 diff)
• ObjectPrototype.cpp (modified) (1 diff)
• RegExpObject.cpp (modified) (1 diff)
• StrictEvalActivation.cpp (modified) (1 diff)
• StringConstructor.cpp (modified) (1 diff)
• StringObject.cpp (modified) (1 diff)
• StringPrototype.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/runtime/ArrayConstructor.cpp

@@ -45 +45 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(ArrayConstructor);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(ArrayConstructor);
 
 const ClassInfo ArrayConstructor::s_info = { "Function", &InternalFunction::s_info, 0, ExecState::arrayConstructorTable, CREATE_METHOD_TABLE(ArrayConstructor) };

trunk/Source/JavaScriptCore/runtime/BooleanConstructor.cpp

@@ -28 +28 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(BooleanConstructor);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(BooleanConstructor);
 
 const ClassInfo BooleanConstructor::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(BooleanConstructor) };

trunk/Source/JavaScriptCore/runtime/BooleanObject.cpp

@@ -27 +27 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(BooleanObject);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(BooleanObject);
 
 const ClassInfo BooleanObject::s_info = { "Boolean", &JSWrapperObject::s_info, 0, 0, CREATE_METHOD_TABLE(BooleanObject) };

trunk/Source/JavaScriptCore/runtime/BooleanPrototype.cpp

@@ -49 +49 @@
 */
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(BooleanPrototype);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(BooleanPrototype);
 
 BooleanPrototype::BooleanPrototype(ExecState* exec, Structure* structure)

trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp

@@ -73 +73 @@
 */
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(DateConstructor);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(DateConstructor);
 
 DateConstructor::DateConstructor(JSGlobalObject* globalObject, Structure* structure)

trunk/Source/JavaScriptCore/runtime/ErrorConstructor.cpp

@@ -30 +30 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(ErrorConstructor);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(ErrorConstructor);
 
 const ClassInfo ErrorConstructor::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(ErrorConstructor) };

trunk/Source/JavaScriptCore/runtime/ErrorInstance.cpp

@@ -27 +27 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(ErrorInstance);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(ErrorInstance);
 
 const ClassInfo ErrorInstance::s_info = { "Error", &JSNonFinalObject::s_info, 0, 0, CREATE_METHOD_TABLE(ErrorInstance) };

trunk/Source/JavaScriptCore/runtime/ErrorPrototype.cpp

@@ -32 +32 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(ErrorPrototype);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(ErrorPrototype);
 
 static EncodedJSValue JSC_HOST_CALL errorProtoFuncToString(ExecState*);

trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp

@@ -42 +42 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(TerminatedExecutionError);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(TerminatedExecutionError);
 
 const ClassInfo TerminatedExecutionError::s_info = { "TerminatedExecutionError", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(TerminatedExecutionError) };

trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp

@@ -36 +36 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(FunctionConstructor);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(FunctionConstructor);
 
 const ClassInfo FunctionConstructor::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(FunctionConstructor) };

trunk/Source/JavaScriptCore/runtime/FunctionPrototype.cpp

@@ -34 +34 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(FunctionPrototype);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(FunctionPrototype);
 
 const ClassInfo FunctionPrototype::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(FunctionPrototype) };

trunk/Source/JavaScriptCore/runtime/GetterSetter.cpp

@@ -31 +31 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(GetterSetter);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(GetterSetter);
 
 const ClassInfo GetterSetter::s_info = { "GetterSetter", 0, 0, 0, CREATE_METHOD_TABLE(GetterSetter) };

trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp

@@ -31 +31 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(InternalFunction);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(InternalFunction);
 
 const ClassInfo InternalFunction::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(InternalFunction) };

trunk/Source/JavaScriptCore/runtime/JSAPIValueWrapper.cpp

@@ -28 +28 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSAPIValueWrapper);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSAPIValueWrapper);
 
 const ClassInfo JSAPIValueWrapper::s_info = { "API Wrapper", 0, 0, 0, CREATE_METHOD_TABLE(JSAPIValueWrapper) };

trunk/Source/JavaScriptCore/runtime/JSArray.cpp

@@ -45 +45 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSArray);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSArray);
 
 const ClassInfo JSArray::s_info = {"Array", &JSNonFinalObject::s_info, 0, 0, CREATE_METHOD_TABLE(JSArray)};

trunk/Source/JavaScriptCore/runtime/JSCell.cpp

@@ -34 +34 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSCell);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSCell);
 
 void JSCell::destroy(JSCell* cell)

trunk/Source/JavaScriptCore/runtime/JSNotAnObject.cpp

@@ -35 +35 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSNotAnObject);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSNotAnObject);
 
 const ClassInfo JSNotAnObject::s_info = { "Object", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSNotAnObject) };

trunk/Source/JavaScriptCore/runtime/JSONObject.cpp

@@ -44 +44 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSONObject);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSONObject);
 
 static EncodedJSValue JSC_HOST_CALL JSONProtoFuncParse(ExecState*);

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -66 +66 @@
 }
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSObject);
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSFinalObject);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSObject);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSFinalObject);
 
 const char* StrictModeReadonlyPropertyWriteError = "Attempted to assign to readonly property.";

trunk/Source/JavaScriptCore/runtime/JSPromiseConstructor.cpp

@@ -41 +41 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSPromiseConstructor);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSPromiseConstructor);
 
 // static Promise fulfill(any value);

trunk/Source/JavaScriptCore/runtime/JSPromisePrototype.cpp

@@ -40 +40 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSPromisePrototype);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSPromisePrototype);
 
 // Promise then([TreatUndefinedAs=Missing] optional AnyCallback fulfillCallback, [TreatUndefinedAs=Missing] optional AnyCallback rejectCallback);

trunk/Source/JavaScriptCore/runtime/JSPromiseResolverConstructor.cpp

@@ -37 +37 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSPromiseResolverConstructor);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSPromiseResolverConstructor);
 
 const ClassInfo JSPromiseResolverConstructor::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSPromiseResolverConstructor) };

trunk/Source/JavaScriptCore/runtime/JSPromiseResolverPrototype.cpp

@@ -37 +37 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSPromiseResolverPrototype);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSPromiseResolverPrototype);
 
 // void fulfill(optional any value);

trunk/Source/JavaScriptCore/runtime/JSProxy.cpp

@@ -32 +32 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSProxy);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSProxy);
 
 const ClassInfo JSProxy::s_info = { "JSProxy", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSProxy) };

trunk/Source/JavaScriptCore/runtime/JSScope.cpp

@@ -35 +35 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSScope);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSScope);
 
 void JSScope::visitChildren(JSCell* cell, SlotVisitor& visitor)

trunk/Source/JavaScriptCore/runtime/JSWrapperObject.cpp

@@ -27 +27 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSWrapperObject);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSWrapperObject);
 
 void JSWrapperObject::visitChildren(JSCell* cell, SlotVisitor& visitor)

trunk/Source/JavaScriptCore/runtime/MathObject.cpp

@@ -33 +33 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(MathObject);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(MathObject);
 
 static EncodedJSValue JSC_HOST_CALL mathProtoFuncAbs(ExecState*);

trunk/Source/JavaScriptCore/runtime/NameConstructor.cpp

@@ -33 +33 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(NameConstructor);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(NameConstructor);
 
 const ClassInfo NameConstructor::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(NameConstructor) };

trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp

@@ -30 +30 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(NativeErrorConstructor);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(NativeErrorConstructor);
 
 const ClassInfo NativeErrorConstructor::s_info = { "Function", &InternalFunction::s_info, 0, 0, CREATE_METHOD_TABLE(NativeErrorConstructor) };

trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp

@@ -42 +42 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(NumberConstructor);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(NumberConstructor);
 
 const ClassInfo NumberConstructor::s_info = { "Function", &InternalFunction::s_info, 0, ExecState::numberConstructorTable, CREATE_METHOD_TABLE(NumberConstructor) };

trunk/Source/JavaScriptCore/runtime/NumberObject.cpp

@@ -29 +29 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(NumberObject);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(NumberObject);
 
 const ClassInfo NumberObject::s_info = { "Number", &JSWrapperObject::s_info, 0, 0, CREATE_METHOD_TABLE(NumberObject) };

trunk/Source/JavaScriptCore/runtime/NumberPrototype.cpp

@@ -69 +69 @@
 */
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(NumberPrototype);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(NumberPrototype);
 
 NumberPrototype::NumberPrototype(ExecState* exec, Structure* structure)

trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp

@@ -59 +59 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(ObjectConstructor);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(ObjectConstructor);
 
 const ClassInfo ObjectConstructor::s_info = { "Function", &InternalFunction::s_info, 0, ExecState::objectConstructorTable, CREATE_METHOD_TABLE(ObjectConstructor) };

trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp

@@ -42 +42 @@
 static EncodedJSValue JSC_HOST_CALL objectProtoFuncToLocaleString(ExecState*);
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(ObjectPrototype);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(ObjectPrototype);
 
 const ClassInfo ObjectPrototype::s_info = { "Object", &JSNonFinalObject::s_info, 0, 0, CREATE_METHOD_TABLE(ObjectPrototype) };

trunk/Source/JavaScriptCore/runtime/RegExpObject.cpp

@@ -51 +51 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(RegExpObject);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(RegExpObject);
 
 const ClassInfo RegExpObject::s_info = { "RegExp", &Base::s_info, 0, ExecState::regExpTable, CREATE_METHOD_TABLE(RegExpObject) };

trunk/Source/JavaScriptCore/runtime/StrictEvalActivation.cpp

@@ -32 +32 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(StrictEvalActivation);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(StrictEvalActivation);
 
 const ClassInfo StrictEvalActivation::s_info = { "Object", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(StrictEvalActivation) };

trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp

@@ -47 +47 @@
 */
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(StringConstructor);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(StringConstructor);
 
 StringConstructor::StringConstructor(JSGlobalObject* globalObject, Structure* structure)

trunk/Source/JavaScriptCore/runtime/StringObject.cpp

@@ -29 +29 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(StringObject);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(StringObject);
 
 const ClassInfo StringObject::s_info = { "String", &JSWrapperObject::s_info, 0, 0, CREATE_METHOD_TABLE(StringObject) };

trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp

@@ -48 +48 @@
 namespace JSC {
 
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(StringPrototype);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(StringPrototype);
 
 static EncodedJSValue JSC_HOST_CALL stringProtoFuncToString(ExecState*);