Temporarily disable deferred stack trace formatting.

R=mstarzinger@chromium.org
BUG=

Review URL: https://chromiumcodereview.appspot.com/11859027

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@13431 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
yangguo@chromium.org 2013-01-18 13:05:03 +00:00
parent 900720454d
commit 284a28e797
4 changed files with 8 additions and 2 deletions

View File

@ -7288,6 +7288,7 @@ void ErrorObjectList::UpdateReferences() {
// Unforwarded objects in new space are dead and removed from the list. // Unforwarded objects in new space are dead and removed from the list.
void ErrorObjectList::UpdateReferencesInNewSpace(Heap* heap) { void ErrorObjectList::UpdateReferencesInNewSpace(Heap* heap) {
if (list_.is_empty()) return;
if (!nested_) { if (!nested_) {
int write_index = 0; int write_index = 0;
for (int i = 0; i < list_.length(); i++) { for (int i = 0; i < list_.length(); i++) {
@ -7315,7 +7316,7 @@ void ErrorObjectList::DeferredFormatStackTrace(Isolate* isolate) {
// If formatting the stack trace causes a GC, this method will be // If formatting the stack trace causes a GC, this method will be
// recursively called. In that case, skip the recursive call, since // recursively called. In that case, skip the recursive call, since
// the loop modifies the list while iterating over it. // the loop modifies the list while iterating over it.
if (nested_ || isolate->has_pending_exception()) return; if (nested_ || list_.is_empty() || isolate->has_pending_exception()) return;
nested_ = true; nested_ = true;
HandleScope scope(isolate); HandleScope scope(isolate);
Handle<String> stack_key = isolate->factory()->stack_symbol(); Handle<String> stack_key = isolate->factory()->stack_symbol();

View File

@ -635,7 +635,6 @@ Handle<JSArray> Isolate::CaptureSimpleStackTrace(Handle<JSObject> error_object,
} }
Handle<JSArray> result = factory()->NewJSArrayWithElements(elements); Handle<JSArray> result = factory()->NewJSArrayWithElements(elements);
result->set_length(Smi::FromInt(cursor)); result->set_length(Smi::FromInt(cursor));
heap()->error_object_list()->Add(*error_object);
return result; return result;
} }

View File

@ -56,6 +56,9 @@ test-profile-generator/RecordStackTraceAtStartProfiling: PASS || FAIL
# We do not yet shrink weak maps after they have been emptied by the GC # We do not yet shrink weak maps after they have been emptied by the GC
test-weakmaps/Shrinking: FAIL test-weakmaps/Shrinking: FAIL
# Deferred stack trace formatting is temporarily disabled.
test-heap/ReleaseStackTraceData: PASS || FAIL
############################################################################## ##############################################################################
[ $arch == arm ] [ $arch == arm ]

View File

@ -40,6 +40,9 @@ regress/regress-524: SKIP
# Skip long running test in debug and allow it to timeout in release mode. # Skip long running test in debug and allow it to timeout in release mode.
# regress/regress-524: (PASS || TIMEOUT), SKIP if $mode == debug # regress/regress-524: (PASS || TIMEOUT), SKIP if $mode == debug
# Deferred stack trace formatting is temporarily disabled.
stack-traces-gc: PASS || FAIL
############################################################################## ##############################################################################
# Too slow in debug mode with --stress-opt # Too slow in debug mode with --stress-opt
compiler/regress-stacktrace-methods: PASS, SKIP if $mode == debug compiler/regress-stacktrace-methods: PASS, SKIP if $mode == debug