| OLD | NEW |
| 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 #include "vm/globals.h" // Needed here to get TARGET_ARCH_XXX. | 5 #include "vm/globals.h" // Needed here to get TARGET_ARCH_XXX. |
| 6 | 6 |
| 7 #include "vm/flow_graph_compiler.h" | 7 #include "vm/flow_graph_compiler.h" |
| 8 | 8 |
| 9 #include "vm/bit_vector.h" | 9 #include "vm/bit_vector.h" |
| 10 #include "vm/cha.h" | 10 #include "vm/cha.h" |
| (...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 413 intptr_t id = | 413 intptr_t id = |
| 414 assembler()->object_pool_wrapper().FindObject(src.constant()); | 414 assembler()->object_pool_wrapper().FindObject(src.constant()); |
| 415 catch_entry_state_maps_builder_->AppendConstant(id, dest_index); | 415 catch_entry_state_maps_builder_->AppendConstant(id, dest_index); |
| 416 continue; | 416 continue; |
| 417 } | 417 } |
| 418 if (src.stack_index() != dest_index) { | 418 if (src.stack_index() != dest_index) { |
| 419 catch_entry_state_maps_builder_->AppendMove(src.stack_index(), | 419 catch_entry_state_maps_builder_->AppendMove(src.stack_index(), |
| 420 dest_index); | 420 dest_index); |
| 421 } | 421 } |
| 422 } | 422 } |
| 423 // TODO(regis): Process type_args slot and type_args var. How? |
| 423 | 424 |
| 424 // Process locals. Skip exception_var and stacktrace_var. | 425 // Process locals. Skip exception_var and stacktrace_var. |
| 425 intptr_t local_base = kFirstLocalSlotFromFp + num_non_copied_params; | 426 intptr_t local_base = kFirstLocalSlotFromFp + num_non_copied_params; |
| 426 intptr_t ex_idx = local_base - catch_block->exception_var().index(); | 427 intptr_t ex_idx = local_base - catch_block->exception_var().index(); |
| 427 intptr_t st_idx = local_base - catch_block->stacktrace_var().index(); | 428 intptr_t st_idx = local_base - catch_block->stacktrace_var().index(); |
| 428 for (; i < flow_graph().variable_count(); ++i) { | 429 for (; i < flow_graph().variable_count(); ++i) { |
| 429 // Don't sync captured parameters. They are not in the environment. | 430 // Don't sync captured parameters. They are not in the environment. |
| 430 if (flow_graph().captured_parameters()->Contains(i)) continue; | 431 if (flow_graph().captured_parameters()->Contains(i)) continue; |
| 431 if (i == ex_idx || i == st_idx) continue; | 432 if (i == ex_idx || i == st_idx) continue; |
| 432 if ((*idefs)[i]->IsConstant()) continue; // Common constants. | 433 if ((*idefs)[i]->IsConstant()) continue; // Common constants. |
| (...skipping 1585 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2018 | 2019 |
| 2019 | 2020 |
| 2020 void FlowGraphCompiler::FrameStateClear() { | 2021 void FlowGraphCompiler::FrameStateClear() { |
| 2021 ASSERT(!is_optimizing()); | 2022 ASSERT(!is_optimizing()); |
| 2022 frame_state_.TruncateTo(0); | 2023 frame_state_.TruncateTo(0); |
| 2023 } | 2024 } |
| 2024 #endif // defined(DEBUG) && !defined(TARGET_ARCH_DBC) | 2025 #endif // defined(DEBUG) && !defined(TARGET_ARCH_DBC) |
| 2025 | 2026 |
| 2026 | 2027 |
| 2027 } // namespace dart | 2028 } // namespace dart |
| OLD | NEW |