Changeset 154853 in webkit for trunk/Source/JavaScriptCore/runtime/VM.cpp

Timestamp:

Aug 29, 2013, 4:36:43 PM (12 years ago)

Author:

Brent Fulgham

Message:

[Windows] Unreviewed build fix after r154847.
If you are going to exclude promises, actually exclude the build components.

• interpreter/CallFrame.h: Exclude promise declarations
• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::reset): Exclude promise code.
(JSC::JSGlobalObject::visitChildren): Ditto.

• runtime/VM.cpp: Ditto.

(JSC::VM::VM):
(JSC::VM::~VM):

• runtime/VM.h:

File:

• trunk/Source/JavaScriptCore/runtime/VM.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/runtime/VM.cpp

@@ -107 +107 @@
 extern const HashTable regExpPrototypeTable;
 extern const HashTable stringConstructorTable;
+#if ENABLE(PROMISES)
 extern const HashTable promisePrototypeTable;
 extern const HashTable promiseConstructorTable;
 extern const HashTable promiseResolverPrototypeTable;
+#endif
 
 // Note: Platform.h will enforce that ENABLE(ASSEMBLER) is true if either
@@ -170 +172 @@
     , regExpPrototypeTable(fastNew<HashTable>(JSC::regExpPrototypeTable))
     , stringConstructorTable(fastNew<HashTable>(JSC::stringConstructorTable))
+#if ENABLE(PROMISES)
     , promisePrototypeTable(fastNew<HashTable>(JSC::promisePrototypeTable))
     , promiseConstructorTable(fastNew<HashTable>(JSC::promiseConstructorTable))
     , promiseResolverPrototypeTable(fastNew<HashTable>(JSC::promiseResolverPrototypeTable))
+#endif
     , identifierTable(vmType == Default ? wtfThreadData().currentIdentifierTable() : createIdentifierTable())
     , propertyNames(new CommonIdentifiers(this))
@@ -322 +326 @@
     regExpPrototypeTable->deleteTable();
     stringConstructorTable->deleteTable();
+#if ENABLE(PROMISES)
     promisePrototypeTable->deleteTable();
     promiseConstructorTable->deleteTable();
     promiseResolverPrototypeTable->deleteTable();
+#endif
 
     fastDelete(const_cast<HashTable*>(arrayConstructorTable));
@@ -343 +349 @@
     fastDelete(const_cast<HashTable*>(regExpPrototypeTable));
     fastDelete(const_cast<HashTable*>(stringConstructorTable));
+#if ENABLE(PROMISES)
     fastDelete(const_cast<HashTable*>(promisePrototypeTable));
     fastDelete(const_cast<HashTable*>(promiseConstructorTable));
     fastDelete(const_cast<HashTable*>(promiseResolverPrototypeTable));
+#endif
 
     delete emptyList;