| Index: runtime/vm/flow_graph_type_propagator.cc
|
| diff --git a/runtime/vm/flow_graph_type_propagator.cc b/runtime/vm/flow_graph_type_propagator.cc
|
| index 64471b73faf9e4617c5a1ff701121cb37fa25c60..f1ec8baed191d07189ed34958bd8831f82e667eb 100644
|
| --- a/runtime/vm/flow_graph_type_propagator.cc
|
| +++ b/runtime/vm/flow_graph_type_propagator.cc
|
| @@ -38,7 +38,7 @@ FlowGraphTypePropagator::FlowGraphTypePropagator(FlowGraph* flow_graph)
|
| types_.Add(NULL);
|
| }
|
|
|
| - if (Isolate::Current()->TypeChecksEnabled()) {
|
| + if (Isolate::Current()->flags().type_checks()) {
|
| asserts_ = new ZoneGrowableArray<AssertAssignableInstr*>(
|
| flow_graph->current_ssa_temp_index());
|
| for (intptr_t i = 0; i < flow_graph->current_ssa_temp_index(); i++) {
|
| @@ -120,7 +120,7 @@ void FlowGraphTypePropagator::PropagateRecursive(BlockEntryInstr* block) {
|
|
|
| const intptr_t rollback_point = rollback_.length();
|
|
|
| - if (Isolate::Current()->TypeChecksEnabled()) {
|
| + if (Isolate::Current()->flags().type_checks()) {
|
| StrengthenAsserts(block);
|
| }
|
|
|
| @@ -921,7 +921,7 @@ CompileType StaticCallInstr::ComputeType() const {
|
| return CompileType::FromCid(result_cid_);
|
| }
|
|
|
| - if (Isolate::Current()->TypeChecksEnabled()) {
|
| + if (Isolate::Current()->flags().type_checks()) {
|
| // Void functions are known to return null, which is checked at the return
|
| // from the function.
|
| const AbstractType& result_type =
|
| @@ -936,7 +936,7 @@ CompileType StaticCallInstr::ComputeType() const {
|
|
|
|
|
| CompileType LoadLocalInstr::ComputeType() const {
|
| - if (Isolate::Current()->TypeChecksEnabled()) {
|
| + if (Isolate::Current()->flags().type_checks()) {
|
| return CompileType::FromAbstractType(local().type());
|
| }
|
| return CompileType::Dynamic();
|
| @@ -980,7 +980,7 @@ CompileType LoadStaticFieldInstr::ComputeType() const {
|
| intptr_t cid = kDynamicCid;
|
| AbstractType* abstract_type = NULL;
|
| const Field& field = this->StaticField();
|
| - if (Isolate::Current()->TypeChecksEnabled()) {
|
| + if (Isolate::Current()->flags().type_checks()) {
|
| cid = kIllegalCid;
|
| abstract_type = &AbstractType::ZoneHandle(field.type());
|
| }
|
| @@ -1038,7 +1038,7 @@ CompileType LoadFieldInstr::ComputeType() const {
|
| }
|
|
|
| const AbstractType* abstract_type = NULL;
|
| - if (Isolate::Current()->TypeChecksEnabled()) {
|
| + if (Isolate::Current()->flags().type_checks()) {
|
| ASSERT(!type().HasResolvedTypeClass() ||
|
| !Field::IsExternalizableCid(Class::Handle(
|
| type().type_class()).id()));
|
|
|