Changeset 89964 in webkit
- Timestamp:
- Jun 28, 2011 2:51:36 PM (13 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r89961 r89964 1 2011-06-28 Oliver Hunt <oliver@apple.com> 2 3 Reviewed by Gavin Barraclough. 4 5 ASSERT when launching debug builds with interpreter and jit enabled 6 https://bugs.webkit.org/show_bug.cgi?id=63566 7 8 Add appropriate guards to the various Executable's memory reporting 9 logic. 10 11 * runtime/Executable.cpp: 12 (JSC::EvalExecutable::compileInternal): 13 (JSC::ProgramExecutable::compileInternal): 14 (JSC::FunctionExecutable::compileForCallInternal): 15 (JSC::FunctionExecutable::compileForConstructInternal): 16 1 17 2011-06-28 Gavin Barraclough <barraclough@apple.com> 2 18 -
trunk/Source/JavaScriptCore/runtime/Executable.cpp
r89885 r89964 154 154 155 155 #if ENABLE(JIT) 156 #if ENABLE(INTERPRETER) 157 if (!m_jitCodeForCall) 158 Heap::heap(this)->reportExtraMemoryCost(sizeof(*m_evalCodeBlock)); 159 else 160 #endif 156 161 Heap::heap(this)->reportExtraMemoryCost(sizeof(*m_evalCodeBlock) + m_jitCodeForCall.size()); 157 162 #else … … 231 236 232 237 #if ENABLE(JIT) 233 Heap::heap(this)->reportExtraMemoryCost(sizeof(*m_programCodeBlock) + m_jitCodeForCall.size()); 238 #if ENABLE(INTERPRETER) 239 if (!m_jitCodeForCall) 240 Heap::heap(this)->reportExtraMemoryCost(sizeof(*m_programCodeBlock)); 241 else 242 #endif 243 Heap::heap(this)->reportExtraMemoryCost(sizeof(*m_programCodeBlock) + m_jitCodeForCall.size()); 234 244 #else 235 245 Heap::heap(this)->reportExtraMemoryCost(sizeof(*m_programCodeBlock)); … … 332 342 333 343 #if ENABLE(JIT) 334 Heap::heap(this)->reportExtraMemoryCost(sizeof(*m_codeBlockForCall) + m_jitCodeForCall.size()); 344 #if ENABLE(INTERPRETER) 345 if (!m_jitCodeForCall) 346 Heap::heap(this)->reportExtraMemoryCost(sizeof(*m_codeBlockForCall)); 347 else 348 #endif 349 Heap::heap(this)->reportExtraMemoryCost(sizeof(*m_codeBlockForCall) + m_jitCodeForCall.size()); 335 350 #else 336 351 Heap::heap(this)->reportExtraMemoryCost(sizeof(*m_codeBlockForCall)); … … 383 398 384 399 #if ENABLE(JIT) 400 #if ENABLE(INTERPRETER) 401 if (!m_jitCodeForConstruct) 402 Heap::heap(this)->reportExtraMemoryCost(sizeof(*m_codeBlockForConstruct)); 403 else 404 #endif 385 405 Heap::heap(this)->reportExtraMemoryCost(sizeof(*m_codeBlockForConstruct) + m_jitCodeForConstruct.size()); 386 406 #else
Note: See TracChangeset
for help on using the changeset viewer.