languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-11-02 15:17:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

VM: [Kernel] Clone Field objects if building IL during background compilation.

Browse source 
R=kustermann@google.com
BUG=

Review URL: https://codereview.chromium.org/2506993004 .
This commit is contained in:
Vyacheslav Egorov 2016-11-18 15:48:27 +01:00
parent 35c828c2d2
commit e924dc4b83
1 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
runtime/vm/kernel_to_il.cc
View file

@ -2360,10 +2360,22 @@ Fragment FlowGraphBuilder::LoadClassId() {
}
const dart::Field& MayCloneField(Zone* zone, const dart::Field& field) {
if ((Compiler::IsBackgroundCompilation() ||
FLAG_force_clone_compiler_objects) &&
field.IsOriginal()) {
return dart::Field::ZoneHandle(zone, field.CloneFromOriginal());
} else {
ASSERT(field.IsZoneHandle());
return field;
}
}
Fragment FlowGraphBuilder::LoadField(const dart::Field& field) {
LoadFieldInstr* load = new (Z)
LoadFieldInstr(Pop(), &field, AbstractType::ZoneHandle(Z, field.type()),
TokenPosition::kNoSource);
LoadFieldInstr* load = new (Z) LoadFieldInstr(
Pop(), &MayCloneField(Z, field),
AbstractType::ZoneHandle(Z, field.type()), TokenPosition::kNoSource);
Push(load);
return Fragment(load);
}
@ -2409,7 +2421,8 @@ Fragment FlowGraphBuilder::LoadLocal(LocalVariable* variable) {
Fragment FlowGraphBuilder::InitStaticField(const dart::Field& field) {
InitStaticFieldInstr* init = new (Z) InitStaticFieldInstr(Pop(), field);
InitStaticFieldInstr* init =
new (Z) InitStaticFieldInstr(Pop(), MayCloneField(Z, field));
return Fragment(init);
}
@ -2527,23 +2540,26 @@ Fragment FlowGraphBuilder::StoreInstanceField(
if (value->BindsToConstant()) {
emit_store_barrier = kNoStoreBarrier;
}
StoreInstanceFieldInstr* store = new (Z) StoreInstanceFieldInstr(
field, Pop(), value, emit_store_barrier, TokenPosition::kNoSource);
StoreInstanceFieldInstr* store = new (Z)
StoreInstanceFieldInstr(MayCloneField(Z, field), Pop(), value,
emit_store_barrier, TokenPosition::kNoSource);
return Fragment(store);
}
Fragment FlowGraphBuilder::StoreInstanceFieldGuarded(const dart::Field& field) {
Fragment instructions;
const dart::Field& field_clone = MayCloneField(Z, field);
if (FLAG_use_field_guards) {
LocalVariable* store_expression = MakeTemporary();
instructions += LoadLocal(store_expression);
instructions += GuardFieldClass(field, Thread::Current()->GetNextDeoptId());
instructions +=
GuardFieldClass(field_clone, Thread::Current()->GetNextDeoptId());
instructions += LoadLocal(store_expression);
instructions +=
GuardFieldLength(field, Thread::Current()->GetNextDeoptId());
GuardFieldLength(field_clone, Thread::Current()->GetNextDeoptId());
}
instructions += StoreInstanceField(field);
instructions += StoreInstanceField(field_clone);
return instructions;
}
@ -2580,8 +2596,8 @@ Fragment FlowGraphBuilder::StoreLocal(LocalVariable* variable) {
Fragment FlowGraphBuilder::StoreStaticField(const dart::Field& field) {
return Fragment(
new (Z) StoreStaticFieldInstr(field, Pop(), TokenPosition::kNoSource));
return Fragment(new (Z) StoreStaticFieldInstr(MayCloneField(Z, field), Pop(),
TokenPosition::kNoSource));
}