Chromium Code Reviews| Index: runtime/vm/debugger.cc |
| diff --git a/runtime/vm/debugger.cc b/runtime/vm/debugger.cc |
| index aea2178a72487f41226d818193b273a4f3170f4b..a9efd83357dbbc7ceac8fb923092721e3edb77f9 100644 |
| --- a/runtime/vm/debugger.cc |
| +++ b/runtime/vm/debugger.cc |
| @@ -1017,7 +1017,7 @@ RawObject* ActivationFrame::GetReceiver() { |
| return value.raw(); |
| } |
| } |
| - return Object::null(); |
| + return Symbols::OptimizedOut().raw(); |
| } |
| @@ -1054,8 +1054,8 @@ RawObject* ActivationFrame::Evaluate(const String& expr) { |
| Array::Handle(Array::MakeArray(param_values))); |
| } else { |
| const Object& receiver = Object::Handle(GetReceiver()); |
| - ASSERT(receiver.IsInstance()); |
| - if (!receiver.IsInstance()) { |
| + ASSERT(receiver.IsInstance() || receiver.IsNull()); |
| + if (!(receiver.IsInstance() || receiver.IsNull())) { |
|
turnidge
2015/12/17 19:42:25
Should you be checkout for <optimized out> here to
|
| return Object::null(); |
| } |
| const Instance& inst = Instance::Cast(receiver); |