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

src/liveedit.cc

 // 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
@@ skipping 1806 matching lines @@
   JavaScriptFrame* m_frame;
   LiveEdit::FunctionPatchabilityStatus m_saved_status;
 };
 
 
 // Finds a drops required frame and all frames above.
 // Returns error message or NULL.
 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;

 }
 
 
 LiveEditFunctionTracker::LiveEditFunctionTracker(Isolate* isolate,
                                                  FunctionLiteral* fun)
     : isolate_(isolate) {
   if (isolate_->active_function_info_listener() != NULL) {
     isolate_->active_function_info_listener()->FunctionStarted(fun);
   }
 }
@@ skipping 50 matching lines @@
 
 bool LiveEditFunctionTracker::IsActive(Isolate* isolate) {
   return false;
 }
 
 #endif  // ENABLE_DEBUGGER_SUPPORT
 
 
 
 } }  // namespace v8::internal