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

Unified Diff: runtime/vm/object.cc

Issue 77043010: - Ensure that classes are finalized before their description is (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 1 month 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
« runtime/bin/vmservice/client/build.dart ('K') | « runtime/vm/compiler.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/object.cc
===================================================================
--- runtime/vm/object.cc (revision 30528)
+++ runtime/vm/object.cc (working copy)
@@ -3231,6 +3231,10 @@
jsobj.AddProperty("name", internal_class_name);
jsobj.AddProperty("user_name", user_visible_class_name);
if (!ref) {
+ const Error& err = Error::Handle(EnsureIsFinalized(Isolate::Current()));
+ if (!err.IsNull()) {
+ jsobj.AddProperty("error", err);
+ }
siva 2013/11/21 19:11:19 This now means classes which have not been compile
jsobj.AddProperty("implemented", is_implemented());
jsobj.AddProperty("abstract", is_abstract());
jsobj.AddProperty("patch", is_patch());
@@ -10626,6 +10630,8 @@
void Error::PrintToJSONStream(JSONStream* stream, bool ref) const {
JSONObject jsobj(stream);
+ jsobj.AddProperty("type", JSONType(false));
+ jsobj.AddProperty("error_msg", ToErrorCString());
}
@@ -10671,6 +10677,8 @@
void ApiError::PrintToJSONStream(JSONStream* stream, bool ref) const {
JSONObject jsobj(stream);
+ jsobj.AddProperty("type", JSONType(false));
+ jsobj.AddProperty("error_msg", ToErrorCString());
}
@@ -10855,6 +10863,8 @@
void LanguageError::PrintToJSONStream(JSONStream* stream, bool ref) const {
JSONObject jsobj(stream);
+ jsobj.AddProperty("type", JSONType(false));
+ jsobj.AddProperty("error_msg", ToErrorCString());
}
@@ -10929,6 +10939,8 @@
void UnhandledException::PrintToJSONStream(JSONStream* stream,
bool ref) const {
JSONObject jsobj(stream);
+ jsobj.AddProperty("type", JSONType(false));
+ jsobj.AddProperty("error_msg", ToErrorCString());
}
@@ -10965,6 +10977,8 @@
void UnwindError::PrintToJSONStream(JSONStream* stream, bool ref) const {
JSONObject jsobj(stream);
+ jsobj.AddProperty("type", JSONType(false));
+ jsobj.AddProperty("error_msg", ToErrorCString());
}
« runtime/bin/vmservice/client/build.dart ('K') | « runtime/vm/compiler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698