Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(211)

Unified Diff: runtime/vm/snapshot.cc

Issue 1672853002: Move sticky_error_ from isolate to thread (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Comments addressed Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/service_isolate.cc ('k') | runtime/vm/thread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/snapshot.cc
diff --git a/runtime/vm/snapshot.cc b/runtime/vm/snapshot.cc
index a1c1d5c259906da39be94c32abf7f1022efa013b..bbeef36c2a96bf5720fbf06ccfc9a2666848c1c6 100644
--- a/runtime/vm/snapshot.cc
+++ b/runtime/vm/snapshot.cc
@@ -234,8 +234,8 @@ RawObject* SnapshotReader::ReadObject() {
return obj.raw();
} else {
// An error occurred while reading, return the error object.
- const Error& err = Error::Handle(isolate()->object_store()->sticky_error());
- isolate()->object_store()->clear_sticky_error();
+ const Error& err = Error::Handle(thread()->sticky_error());
+ thread()->clear_sticky_error();
return err.raw();
}
}
@@ -2488,7 +2488,7 @@ intptr_t SnapshotWriter::FindVmSnapshotObject(RawObject* rawobj) {
void SnapshotWriter::ThrowException(Exceptions::ExceptionType type,
const char* msg) {
- object_store()->clear_sticky_error();
+ thread()->clear_sticky_error();
if (msg != NULL) {
const String& msg_obj = String::Handle(String::New(msg));
const Array& args = Array::Handle(Array::New(1));
« no previous file with comments | « runtime/vm/service_isolate.cc ('k') | runtime/vm/thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698