Changeset 34088 in webkit for trunk/JavaScriptCore/kjs/collector.cpp

Timestamp:

May 23, 2008, 12:42:26 PM (17 years ago)

Author:

[email protected]

Message:

2008-05-23 Darin Adler <Darin Adler>

Reviewed by Mark Rowe.

As allocateNumber is used via jsNumberCell outside of JavaScriptCore,
we need to provide a non-inlined version of it to avoid creating a
weak external symbol.

• JavaScriptCore.exp:
• kjs/AllInOneFile.cpp:
• kjs/collector.cpp: (KJS::Collector::allocate): (KJS::Collector::allocateNumber):
• kjs/collector.h: (KJS::Collector::allocate): (KJS::Collector::inlineAllocateNumber):
• kjs/value.h: (KJS::NumberImp::operator new):

File:

• trunk/JavaScriptCore/kjs/collector.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/collector.cpp

@@ -292 +292 @@
   return newCell;
 }
-#if !PLATFORM(MAC)
+
+#ifndef JAVASCRIPTCORE_BUILDING_ALL_IN_ONE_FILE
 void* Collector::allocate(size_t s)
 {
     return heapAllocate<PrimaryHeap>(s);
 }
+#endif
 
 void* Collector::allocateNumber(size_t s)
@@ -302 +304 @@
     return heapAllocate<NumberHeap>(s);
 }
-#endif
 
 static inline void* currentThreadStackBase()