From ed371d488196f9d6b665073d1846689a05c6843f Mon Sep 17 00:00:00 2001 From: "peter.rybin@gmail.com" Date: Fri, 13 Jul 2012 09:02:03 +0000 Subject: [PATCH] Don't miss error message in 'restart frame' debug action Review URL: https://chromiumcodereview.appspot.com/10693095 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12074 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/liveedit.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/liveedit.cc b/src/liveedit.cc index d86314c507..1a21deadfd 100644 --- a/src/liveedit.cc +++ b/src/liveedit.cc @@ -1824,7 +1824,14 @@ class SingleFrameTarget { const char* LiveEdit::RestartFrame(JavaScriptFrame* frame, Zone* zone) { SingleFrameTarget target(frame); - return DropActivationsInActiveThreadImpl(target, true, zone); + const char* result = DropActivationsInActiveThreadImpl(target, true, zone); + if (result != NULL) { + return result; + } + if (target.saved_status() == LiveEdit::FUNCTION_BLOCKED_UNDER_NATIVE_CODE) { + return "Function is blocked under native code"; + } + return NULL; }