From c638a5e3e1e5ba612f13ca98d32278adc86c04d1 Mon Sep 17 00:00:00 2001 From: "yurys@chromium.org" Date: Tue, 30 Apr 2013 16:51:30 +0000 Subject: [PATCH] Revert "frames.h/cc cleanup" This reverts r14496 which broke tests in debug mode: Command: /mnt/data/b/build/slave/v8-linux-nosnap-debug/build/v8/out/Debug/cctest test-log/LogAccessorCallbacks --nobreak-on-abort --nodead-code-elimination --nofold-constants --enable-slow-asserts --debug-code --verify-heap --testing_serialization_file=/mnt/data/b/build/slave/v8-linux-nosnap-debug/build/v8/out/.serdes/serdes_LogAccessorCallbacks === cctest/test-log/LogCallbacks === --- stderr --- TBR=jkummerow@chromium.org BUG=None Review URL: https://codereview.chromium.org/14651004 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14502 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/frames.cc | 1 + src/frames.h | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/frames.cc b/src/frames.cc index a389df4..aaf8c79 100644 --- a/src/frames.cc +++ b/src/frames.cc @@ -168,6 +168,7 @@ void StackFrameIterator::Reset() { reinterpret_cast(StandardFrame::ComputePCAddress(fp_))); type = StackFrame::ComputeType(isolate(), &state); } + if (SingletonFor(type) == NULL) return; frame_ = SingletonFor(type, &state); } diff --git a/src/frames.h b/src/frames.h index 30ccf38..678191b 100644 --- a/src/frames.h +++ b/src/frames.h @@ -969,11 +969,9 @@ typedef JavaScriptFrameIteratorTemp class SafeStackTraceFrameIterator: public SafeJavaScriptFrameIterator { public: - SafeStackTraceFrameIterator(Isolate* isolate, - Address fp, - Address sp, - Address low_bound, - Address high_bound); + explicit SafeStackTraceFrameIterator(Isolate* isolate, + Address fp, Address sp, + Address low_bound, Address high_bound); void Advance(); }; -- 2.7.4