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

Unified Diff: runtime/vm/parser.cc

Issue 260713008: Add support for javascript incompatibility warnings. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 7 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
Index: runtime/vm/parser.cc
===================================================================
--- runtime/vm/parser.cc (revision 35921)
+++ runtime/vm/parser.cc (working copy)
@@ -9002,6 +9002,7 @@
String::Handle(field.name()).ToCString());
} else {
isolate()->long_jump_base()->Jump(1, error);
+ UNREACHABLE();
}
}
ASSERT(const_value.IsNull() || const_value.IsInstance());
@@ -10297,14 +10298,16 @@
interpolate_arg.SetAt(0, value_arr);
// Call interpolation function.
- String& concatenated = String::ZoneHandle(isolate());
+ Object& result = Object::Handle(isolate());
{
PAUSETIMERSCOPE(isolate(), time_compilation);
- concatenated ^= DartEntry::InvokeFunction(func, interpolate_arg);
+ result = DartEntry::InvokeFunction(func, interpolate_arg);
}
- if (concatenated.IsUnhandledException()) {
- ErrorMsg("Exception thrown in Parser::Interpolate");
+ if (result.IsUnhandledException()) {
+ ErrorMsg("%s", Error::Cast(result).ToErrorCString());
}
+ String& concatenated = String::ZoneHandle(isolate());
+ concatenated ^= result.raw();
concatenated = Symbols::New(concatenated);
return concatenated;
}

Powered by Google App Engine
This is Rietveld 408576698