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

Unified Diff: runtime/vm/object.cc

Issue 2632253002: VM: [Kernel] Partial support for metadata annotations (Closed)
Patch Set: Address comments Created 3 years, 11 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/object.h ('k') | tests/co19/co19-kernel.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index 3675bfb32ff3382e8771900b79c80636bf4cdfb1..7f85580c24ae48780918ff7f8048dbcd8bc39296 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -29,6 +29,7 @@
#include "vm/heap.h"
#include "vm/intrinsifier.h"
#include "vm/isolate_reload.h"
+#include "vm/kernel_to_il.h"
#include "vm/object_store.h"
#include "vm/parser.h"
#include "vm/precompiler.h"
@@ -9681,7 +9682,8 @@ static RawString* MakeTypeParameterMetaName(Thread* thread,
void Library::AddMetadata(const Object& owner,
const String& name,
- TokenPosition token_pos) const {
+ TokenPosition token_pos,
+ kernel::TreeNode* kernel_node) const {
Thread* thread = Thread::Current();
ASSERT(thread->IsMutatorThread());
Zone* zone = thread->zone();
@@ -9694,6 +9696,7 @@ void Library::AddMetadata(const Object& owner,
field.SetFieldType(Object::dynamic_type());
field.set_is_reflectable(false);
field.SetStaticValue(Array::empty_array(), true);
+ field.set_kernel_field(kernel_node);
GrowableObjectArray& metadata =
GrowableObjectArray::Handle(zone, this->metadata());
metadata.Add(field, Heap::kOld);
@@ -9702,34 +9705,37 @@ void Library::AddMetadata(const Object& owner,
void Library::AddClassMetadata(const Class& cls,
const Object& tl_owner,
- TokenPosition token_pos) const {
+ TokenPosition token_pos,
+ kernel::TreeNode* kernel_node) const {
Thread* thread = Thread::Current();
Zone* zone = thread->zone();
// We use the toplevel class as the owner of a class's metadata field because
// a class's metadata is in scope of the library, not the class.
AddMetadata(tl_owner,
String::Handle(zone, MakeClassMetaName(thread, zone, cls)),
- token_pos);
+ token_pos, kernel_node);
}
void Library::AddFieldMetadata(const Field& field,
- TokenPosition token_pos) const {
+ TokenPosition token_pos,
+ kernel::TreeNode* kernel_node) const {
Thread* thread = Thread::Current();
Zone* zone = thread->zone();
AddMetadata(Object::Handle(zone, field.RawOwner()),
String::Handle(zone, MakeFieldMetaName(thread, zone, field)),
- token_pos);
+ token_pos, kernel_node);
}
void Library::AddFunctionMetadata(const Function& func,
- TokenPosition token_pos) const {
+ TokenPosition token_pos,
+ kernel::TreeNode* kernel_node) const {
Thread* thread = Thread::Current();
Zone* zone = thread->zone();
AddMetadata(Object::Handle(zone, func.RawOwner()),
String::Handle(zone, MakeFunctionMetaName(thread, zone, func)),
- token_pos);
+ token_pos, kernel_node);
}
@@ -9801,7 +9807,14 @@ RawObject* Library::GetMetadata(const Object& obj) const {
Object& metadata = Object::Handle();
metadata = field.StaticValue();
if (field.StaticValue() == Object::empty_array().raw()) {
- metadata = Parser::ParseMetadata(field);
+ kernel::TreeNode* kernel_node =
+ reinterpret_cast<kernel::TreeNode*>(field.kernel_field());
+
+ if (kernel_node != NULL) {
+ metadata = kernel::EvaluateMetadata(kernel_node);
+ } else {
+ metadata = Parser::ParseMetadata(field);
+ }
if (metadata.IsArray()) {
ASSERT(Array::Cast(metadata).raw() != Object::empty_array().raw());
field.SetStaticValue(Array::Cast(metadata), true);
« no previous file with comments | « runtime/vm/object.h ('k') | tests/co19/co19-kernel.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698