From bafcfe5427eb371faa67f613611665864dfc8f4b Mon Sep 17 00:00:00 2001 From: "erik.corry@gmail.com" Date: Mon, 17 Sep 2012 11:38:24 +0000 Subject: [PATCH] Fix misplaced assert in heap.cc. Bug=2336 Review URL: https://chromiumcodereview.appspot.com/10911334 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12528 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/heap.cc | 4 ++- test/mjsunit/bugs/bug-2337.js | 53 ++++++++++++++++++++++++++++ test/mjsunit/regress/regress-2336.js | 53 ++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 test/mjsunit/bugs/bug-2337.js create mode 100644 test/mjsunit/regress/regress-2336.js diff --git a/src/heap.cc b/src/heap.cc index bdb63bffc0..6c65454bd4 100644 --- a/src/heap.cc +++ b/src/heap.cc @@ -619,10 +619,12 @@ bool Heap::CollectGarbage(AllocationSpace space, PerformGarbageCollection(collector, &tracer); rate->Stop(); + ASSERT(collector == SCAVENGER || incremental_marking()->IsStopped()); + + // This can do debug callbacks and restart incremental marking. GarbageCollectionEpilogue(); } - ASSERT(collector == SCAVENGER || incremental_marking()->IsStopped()); if (incremental_marking()->IsStopped()) { if (incremental_marking()->WorthActivating() && NextGCIsLikelyToBeFull()) { incremental_marking()->Start(); diff --git a/test/mjsunit/bugs/bug-2337.js b/test/mjsunit/bugs/bug-2337.js new file mode 100644 index 0000000000..ebf7621c45 --- /dev/null +++ b/test/mjsunit/bugs/bug-2337.js @@ -0,0 +1,53 @@ +// Copyright 2012 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Flags: --expose-debug-as debug --expose-gc + +// If one callback causes a GC then the other callbacks don't take place. + +var f = eval("(function f() { return 42; })"); +var f2 = eval("(function f2() { return 43; })"); + +Debug = debug.Debug; + +var called = 0; + +function listener(event, exec_state, event_data, data) { + if (event == Debug.DebugEvent.ScriptCollected) { + if (called != 2) { + called++; + gc(); + } + } +}; + +Debug.scripts(); +Debug.setListener(listener); +f = void 0; +f2 = void 0; +gc(); +assertTrue(called == 2); diff --git a/test/mjsunit/regress/regress-2336.js b/test/mjsunit/regress/regress-2336.js new file mode 100644 index 0000000000..edfff60211 --- /dev/null +++ b/test/mjsunit/regress/regress-2336.js @@ -0,0 +1,53 @@ +// Copyright 2012 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Flags: --expose-debug-as debug --expose-gc + +// Check that we can cope with a debug listener that runs in the +// GC epilogue and causes enough allocation to trigger a new GC during +// the epilogue. + +var f = eval("(function f() { return 42; })"); + +Debug = debug.Debug; + +var called = false; + +function listener(event, exec_state, event_data, data) { + if (event == Debug.DebugEvent.ScriptCollected) { + if (!called) { + called = true; + gc(); + } + } +}; + +Debug.scripts(); +Debug.setListener(listener); +f = void 0; +gc(); +assertTrue(called);