| Index: runtime/vm/parser.cc
|
| diff --git a/runtime/vm/parser.cc b/runtime/vm/parser.cc
|
| index bed681e8ae70aaf8af2e1dbe44b39912cefe4eec..9ebd0ce6acaf07aa110963d69ace3d25c3960663 100644
|
| --- a/runtime/vm/parser.cc
|
| +++ b/runtime/vm/parser.cc
|
| @@ -919,10 +919,9 @@ RawObject* Parser::ParseFunctionParameters(const Function& func) {
|
| return param_descriptor.raw();
|
| } else {
|
| Thread* thread = Thread::Current();
|
| - Isolate* isolate = thread->isolate();
|
| Error& error = Error::Handle();
|
| - error = isolate->object_store()->sticky_error();
|
| - isolate->object_store()->clear_sticky_error();
|
| + error = thread->sticky_error();
|
| + thread->clear_sticky_error();
|
| return error.raw();
|
| }
|
| UNREACHABLE();
|
| @@ -953,7 +952,7 @@ bool Parser::ParseFormalParameters(const Function& func, ParamList* params) {
|
| parser.ParseFormalParameterList(true, true, params);
|
| return true;
|
| } else {
|
| - Thread::Current()->isolate()->object_store()->clear_sticky_error();
|
| + Thread::Current()->clear_sticky_error();
|
| params->Clear();
|
| return false;
|
| }
|
| @@ -1101,12 +1100,11 @@ RawObject* Parser::ParseMetadata(const Field& meta_data) {
|
| return metadata;
|
| } else {
|
| Thread* thread = Thread::Current();
|
| - Isolate* isolate = thread->isolate();
|
| StackZone stack_zone(thread);
|
| Zone* zone = stack_zone.GetZone();
|
| Error& error = Error::Handle(zone);
|
| - error = isolate->object_store()->sticky_error();
|
| - isolate->object_store()->clear_sticky_error();
|
| + error = thread->sticky_error();
|
| + thread->clear_sticky_error();
|
| return error.raw();
|
| }
|
| UNREACHABLE();
|
|
|