From 3b244f7ea5baea3245f60717e3d8e00fd4e33aa3 Mon Sep 17 00:00:00 2001 From: mjs Date: Tue, 9 Dec 2003 22:26:20 +0000 Subject: [PATCH] Reviewed by John. : JavaScriptCore should assert that interpreter is locked in collector * kjs/collector.cpp: (KJS::Collector::allocate): Assert that interpreter lock count is not 0. (KJS::Collector::collect): likewise git-svn-id: https://svn.webkit.org/repository/webkit/trunk@5730 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- JavaScriptCore/ChangeLog | 10 ++++++++++ JavaScriptCore/kjs/collector.cpp | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog index b0865f6..3e3724a 100644 --- a/JavaScriptCore/ChangeLog +++ b/JavaScriptCore/ChangeLog @@ -1,3 +1,13 @@ +2003-12-09 Maciej Stachowiak + + Reviewed by John. + + : JavaScriptCore should assert that interpreter is locked in collector + + * kjs/collector.cpp: + (KJS::Collector::allocate): Assert that interpreter lock count is not 0. + (KJS::Collector::collect): likewise + 2003-12-08 Richard Williamson LiveConnect: The last piece of the JavaScript side of the diff --git a/JavaScriptCore/kjs/collector.cpp b/JavaScriptCore/kjs/collector.cpp index ef371c0..ec6cfb6 100644 --- a/JavaScriptCore/kjs/collector.cpp +++ b/JavaScriptCore/kjs/collector.cpp @@ -88,6 +88,8 @@ bool Collector::memoryFull = false; void* Collector::allocate(size_t s) { + assert(Interpreter::lockCount() > 0); + if (s == 0) return 0L; @@ -162,6 +164,8 @@ void* Collector::allocate(size_t s) bool Collector::collect() { + assert(Interpreter::lockCount() > 0); + bool deleted = false; // MARK: first mark all referenced objects recursively -- 1.8.3.1