dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[vm/compiler] Fix type propagation for Redefinitions.

Browse Source 
In addition to the underlying type (stored as either a cid or an
AbstractType), CompileTypes also store two flags: whether a value of the
type can be null and whether it can be a sentinel.

When constraining the type of a definition via a RedefinitionInstr, the
resulting type should be nullable only if both the original and
constrained type are. Similarly, the resulting type should only allow
the sentinel value if both the original and constrained type do.

When the underlying type is represented by a cid, this was already
the case. When it is represented by an AbstractType, only nullability
was appropriately handled. This CL fixes it so that the possibility of
being a sentinel is also handled correctly in the latter case.

TEST=vm/cc/TypePropagator_RedefineCanBeSentinelWithCannotBe

Bug: https://github.com/dart-lang/sdk/issues/47739
Change-Id: I9d51b1c14ff385d522309f9c984a25dc6bdfbbf4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/220767
Commit-Queue: Tess Strickland <sstrickl@google.com>
Reviewed-by: Daco Harkes <dacoharkes@google.com>
This commit is contained in:
Tess Strickland
2021-11-19 16:35:27 +00:00
committed by commit-bot@chromium.org
parent 8b4dea23fa
commit 727eaf1a0f
2 changed files with 133 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/vm/compiler/backend/type_propagator.cc
+12 -6
View File
@@ -1025,6 +1025,7 @@ CompileType RedefinitionInstr::ComputeType() const {
// If either type is non-nullable, the resulting type is non-nullable.
const bool is_nullable =
value()->Type()->is_nullable() && constrained_type_->is_nullable();
// The resulting type can be the sentinel value only if both types can be.
const bool can_be_sentinel = value()->Type()->can_be_sentinel() &&
constrained_type_->can_be_sentinel();
@@ -1037,13 +1038,18 @@ CompileType RedefinitionInstr::ComputeType() const {
return CompileType(is_nullable, can_be_sentinel,
constrained_type_->ToNullableCid(), nullptr);
}
if (value()->Type()->IsSubtypeOf(*constrained_type_->ToAbstractType())) {
return is_nullable ? *value()->Type()
: value()->Type()->CopyNonNullable();
} else {
return is_nullable ? *constrained_type_
: constrained_type_->CopyNonNullable();
CompileType result(
value()->Type()->IsSubtypeOf(*constrained_type_->ToAbstractType())
? *value()->Type()
: *constrained_type_);
if (!is_nullable) {
result = result.CopyNonNullable();
}
if (!can_be_sentinel) {
result = result.CopyNonSentinel();
}
return result;
}
return *value()->Type();
}
runtime/vm/compiler/backend/type_propagator_test.cc
+121
View File
@@ -590,6 +590,127 @@ ISOLATE_UNIT_TEST_CASE(TypePropagator_NonNullableLoadStaticField) {
EXPECT_PROPERTY(load->AsLoadStaticField()->Type(), !it.is_nullable());
}
ISOLATE_UNIT_TEST_CASE(TypePropagator_RedefineCanBeSentinelWithCannotBe) {
const char* kScript = R"(
late final int x;
)";
Zone* const Z = Thread::Current()->zone();
const auto& root_library = Library::CheckedHandle(Z, LoadTestScript(kScript));
const auto& toplevel = Class::Handle(Z, root_library.toplevel_class());
const auto& field_x = Field::Handle(
Z, toplevel.LookupStaticField(String::Handle(Z, String::New("x"))));
using compiler::BlockBuilder;
CompilerState S(thread, /*is_aot=*/false, /*is_optimizing=*/true);
FlowGraphBuilderHelper H;
// We are going to build the following graph:
//
// B0[graph]:0 {
// v2 <- Constant(#3)
// }
// B1[function entry]:2
// v3 <- LoadStaticField:10(x, ThrowIfSentinel)
// v5 <- Constant(#sentinel)
// Branch if StrictCompare:12(===, v3, v5) goto (2, 3)
// B2[target]:4
// goto:16 B4
// B3[target]:6
// v7 <- Redefinition(v3 ^ T{int?})
// goto:18 B4
// B4[join]:8 pred(B2, B3) {
// v9 <- phi(v2, v7) alive
// }
// Return:20(v9)
Definition* v2 = H.IntConstant(3);
Definition* v3;
Definition* v7;
PhiInstr* v9;
auto b1 = H.flow_graph()->graph_entry()->normal_entry();
auto b2 = H.TargetEntry();
auto b3 = H.TargetEntry();
auto b4 = H.JoinEntry();
{
BlockBuilder builder(H.flow_graph(), b1);
v3 = builder.AddDefinition(new LoadStaticFieldInstr(
field_x, {},
/*calls_initializer=*/false, S.GetNextDeoptId()));
auto v5 = builder.AddDefinition(new ConstantInstr(Object::sentinel()));
builder.AddBranch(new StrictCompareInstr(
{}, Token::kEQ_STRICT, new Value(v3), new Value(v5),
/*needs_number_check=*/false, S.GetNextDeoptId()),
b2, b3);
}
{
BlockBuilder builder(H.flow_graph(), b2);
builder.AddInstruction(new GotoInstr(b4, S.GetNextDeoptId()));
}
{
BlockBuilder builder(H.flow_graph(), b3);
v7 = builder.AddDefinition(new RedefinitionInstr(new Value(v3)));
CompileType int_type = CompileType::FromAbstractType(
Type::Handle(Type::IntType()),
/*can_be_null=*/
!IsolateGroup::Current()->use_strict_null_safety_checks(),
/*can_be_sentinel=*/false);
v7->AsRedefinition()->set_constrained_type(new CompileType(int_type));
builder.AddInstruction(new GotoInstr(b4, S.GetNextDeoptId()));
}
{
BlockBuilder builder(H.flow_graph(), b4);
v9 = H.Phi(b4, {{b2, v2}, {b3, v7}});
builder.AddPhi(v9);
builder.AddReturn(new Value(v9));
}
H.FinishGraph();
FlowGraphPrinter::PrintGraph("Before TypePropagator", H.flow_graph());
FlowGraphTypePropagator::Propagate(H.flow_graph());
FlowGraphPrinter::PrintGraph("After TypePropagator", H.flow_graph());
auto& blocks = H.flow_graph()->reverse_postorder();
EXPECT_EQ(5, blocks.length());
EXPECT_PROPERTY(blocks[0], it.IsGraphEntry());
// We expect the following types:
//
// B1[function entry]:2
// v3 <- LoadStaticField:10(x) T{int?~} // T{int~} in null safe mode
// v5 <- Constant(#sentinel) T{Sentinel~}
// Branch if StrictCompare:12(===, v3, v5) goto (2, 3)
EXPECT_PROPERTY(blocks[1], it.IsFunctionEntry());
EXPECT_PROPERTY(blocks[1]->next(), it.IsLoadStaticField());
EXPECT_PROPERTY(blocks[1]->next()->AsLoadStaticField(), it.HasType());
EXPECT_PROPERTY(blocks[1]->next()->AsLoadStaticField()->Type(),
it.can_be_sentinel());
// B3[target]:6
// v7 <- Redefinition(v3 ^ T{int?}) T{int?} // T{int} in null safe mode
// goto:18 B4
EXPECT_PROPERTY(blocks[3], it.IsTargetEntry());
EXPECT_PROPERTY(blocks[3]->next(), it.IsRedefinition());
EXPECT_PROPERTY(blocks[3]->next()->AsRedefinition(), it.HasType());
EXPECT_PROPERTY(blocks[3]->next()->AsRedefinition()->Type(),
!it.can_be_sentinel());
// B4[join]:8 pred(B2, B3) {
// v9 <- phi(v2, v7) alive T{int?} // T{int} in null safe mode
// }
// Return:20(v9)
EXPECT_PROPERTY(blocks[4], it.IsJoinEntry());
EXPECT_PROPERTY(blocks[4], it.AsJoinEntry()->phis() != nullptr);
EXPECT_PROPERTY(blocks[4]->AsJoinEntry()->phis()->At(0), it.HasType());
EXPECT_PROPERTY(blocks[4]->AsJoinEntry()->phis()->At(0)->Type(),
!it.can_be_sentinel());
}
#endif // defined(DART_PRECOMPILER)
} // namespace dart