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

Unified Diff: runtime/vm/parser.cc

Issue 68333007: Handle undefined field/getter access from arguments to const constructors in metadata, and related … (Closed) Base URL: https://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
« no previous file with comments | « runtime/vm/parser.h ('k') | tests/lib/mirrors/metadata_allowed_values_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/parser.cc
diff --git a/runtime/vm/parser.cc b/runtime/vm/parser.cc
index a273184a3d926ed86023eeb34b1c882f76b93a51..1bde3836f6d569ee4813a99eab900378b8e44c4c 100644
--- a/runtime/vm/parser.cc
+++ b/runtime/vm/parser.cc
@@ -244,6 +244,7 @@ Parser::Parser(const Script& script, const Library& library, intptr_t token_pos)
token_kind_(Token::kILLEGAL),
current_block_(NULL),
is_top_level_(false),
+ parsing_metadata_(false),
current_member_(NULL),
allow_function_literals_(true),
parsed_function_(NULL),
@@ -270,6 +271,7 @@ Parser::Parser(const Script& script,
token_kind_(Token::kILLEGAL),
current_block_(NULL),
is_top_level_(false),
+ parsing_metadata_(false),
current_member_(NULL),
allow_function_literals_(true),
parsed_function_(parsed_function),
@@ -859,6 +861,7 @@ RawObject* Parser::ParseMetadata(const Class& cls, intptr_t token_pos) {
const Library& lib = Library::Handle(cls.library());
Parser parser(script, lib, token_pos);
parser.set_current_class(cls);
+ parser.set_parsing_metadata(true);
return parser.EvaluateMetadata();
} else {
Error& error = Error::Handle();
@@ -8243,7 +8246,13 @@ AstNode* Parser::LoadFieldIfUnresolved(AstNode* node) {
// NoSuchMethodError to be thrown.
// In an instance method, we convert this into a getter call
// for a field (which may be defined in a subclass.)
+ // In metadata, an unresolved identifier cannot be a compile-time constant.
String& name = String::CheckedZoneHandle(primary->primary().raw());
+ if (parsing_metadata_) {
+ ErrorMsg(primary->token_pos(),
+ "unresolved identifier '%s' is not a compile-time constant",
+ name.ToCString());
+ }
if (current_function().is_static() ||
current_function().IsInFactoryScope()) {
return new StaticGetterNode(primary->token_pos(),
@@ -8271,6 +8280,11 @@ AstNode* Parser::LoadClosure(PrimaryNode* primary) {
closure = CreateImplicitClosureNode(func, primary->token_pos(), NULL);
} else {
// Instance function access.
+ if (parsing_metadata_) {
+ ErrorMsg(primary->token_pos(),
+ "cannot access instance method '%s' from metadata",
+ funcname.ToCString());
+ }
if (current_function().is_static() ||
current_function().IsInFactoryScope()) {
ErrorMsg(primary->token_pos(),
@@ -8653,6 +8667,11 @@ void Parser::CheckInstanceFieldAccess(intptr_t field_pos,
const String& field_name) {
// Fields are not accessible from a static function, except from a
// constructor, which is considered as non-static by the compiler.
+ if (parsing_metadata_) {
+ ErrorMsg(field_pos,
+ "cannot access instance field '%s' from metadata",
+ field_name.ToCString());
+ }
if (current_function().is_static()) {
ErrorMsg(field_pos,
"cannot access instance field '%s' from a static function",
« no previous file with comments | « runtime/vm/parser.h ('k') | tests/lib/mirrors/metadata_allowed_values_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698