Don't miss error message in 'restart frame' debug action

src/liveedit.cc

Index: src/liveedit.cc
diff --git a/src/liveedit.cc b/src/liveedit.cc
index 0b8654b468302816a64bf38afbb3c0b036c8930c..eec5b0c4e20b04effe59fcca9eb6f6371639f757 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;

[Yang, 2012/07/05 08:51:16]

Could be shorter:

if (result == NULL &&
    target.saved_status() == [etc.]) {
  return [error message];
}
return result;

 }