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

Side by Side Diff: runtime/vm/flow_graph_compiler.cc

Issue 1291803009: Enable concurrent optimization test after migrating scopes to Thread* (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Update ASSERT in LongJumpScope. Created 5 years, 4 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 unified diff | Download patch
« no previous file with comments | « runtime/vm/dart_api_impl.cc ('k') | runtime/vm/flow_graph_inliner.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 parsed_function_(parsed_function), 168 parsed_function_(parsed_function),
169 flow_graph_(*flow_graph), 169 flow_graph_(*flow_graph),
170 block_order_(*flow_graph->CodegenBlockOrder(is_optimizing)), 170 block_order_(*flow_graph->CodegenBlockOrder(is_optimizing)),
171 current_block_(NULL), 171 current_block_(NULL),
172 exception_handlers_list_(NULL), 172 exception_handlers_list_(NULL),
173 pc_descriptors_list_(NULL), 173 pc_descriptors_list_(NULL),
174 stackmap_table_builder_(NULL), 174 stackmap_table_builder_(NULL),
175 block_info_(block_order_.length()), 175 block_info_(block_order_.length()),
176 deopt_infos_(), 176 deopt_infos_(),
177 static_calls_target_table_(GrowableObjectArray::ZoneHandle( 177 static_calls_target_table_(GrowableObjectArray::ZoneHandle(
178 GrowableObjectArray::New())), 178 // TODO(srdjan): Zone-allocate this array instead?
179 GrowableObjectArray::New(Heap::kOld))),
179 is_optimizing_(is_optimizing), 180 is_optimizing_(is_optimizing),
180 may_reoptimize_(false), 181 may_reoptimize_(false),
181 intrinsic_mode_(false), 182 intrinsic_mode_(false),
182 double_class_(Class::ZoneHandle( 183 double_class_(Class::ZoneHandle(
183 isolate_->object_store()->double_class())), 184 isolate_->object_store()->double_class())),
184 mint_class_(Class::ZoneHandle( 185 mint_class_(Class::ZoneHandle(
185 isolate_->object_store()->mint_class())), 186 isolate_->object_store()->mint_class())),
186 float32x4_class_(Class::ZoneHandle( 187 float32x4_class_(Class::ZoneHandle(
187 isolate_->object_store()->float32x4_class())), 188 isolate_->object_store()->float32x4_class())),
188 float64x2_class_(Class::ZoneHandle( 189 float64x2_class_(Class::ZoneHandle(
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 ASSERT(is_optimizing() || FrameStateIsSafeToCall()); 510 ASSERT(is_optimizing() || FrameStateIsSafeToCall());
510 #endif 511 #endif
511 } 512 }
512 513
513 if (inline_id_to_function_.length() > max_inlining_id + 1) { 514 if (inline_id_to_function_.length() > max_inlining_id + 1) {
514 // TODO(srdjan): Some inlined function can disappear, 515 // TODO(srdjan): Some inlined function can disappear,
515 // truncate 'inline_id_to_function_'. 516 // truncate 'inline_id_to_function_'.
516 } 517 }
517 518
518 if (is_optimizing()) { 519 if (is_optimizing()) {
519 LogBlock lb(Isolate::Current()); 520 LogBlock lb(Thread::Current());
520 intervals.Add(IntervalStruct(prev_offset, prev_inlining_id)); 521 intervals.Add(IntervalStruct(prev_offset, prev_inlining_id));
521 inlined_code_intervals_ = 522 inlined_code_intervals_ =
522 Array::New(intervals.length() * Code::kInlIntNumEntries, Heap::kOld); 523 Array::New(intervals.length() * Code::kInlIntNumEntries, Heap::kOld);
523 Smi& start_h = Smi::Handle(); 524 Smi& start_h = Smi::Handle();
524 Smi& caller_inline_id = Smi::Handle(); 525 Smi& caller_inline_id = Smi::Handle();
525 Smi& inline_id = Smi::Handle(); 526 Smi& inline_id = Smi::Handle();
526 for (intptr_t i = 0; i < intervals.length(); i++) { 527 for (intptr_t i = 0; i < intervals.length(); i++) {
527 if (FLAG_trace_inlining_intervals && is_optimizing()) { 528 if (FLAG_trace_inlining_intervals && is_optimizing()) {
528 const Function& function = 529 const Function& function =
529 *inline_id_to_function_.At(intervals[i].inlining_id); 530 *inline_id_to_function_.At(intervals[i].inlining_id);
(...skipping 1288 matching lines...) Expand 10 before | Expand all | Expand 10 after
1818 1819
1819 1820
1820 void FlowGraphCompiler::FrameStateClear() { 1821 void FlowGraphCompiler::FrameStateClear() {
1821 ASSERT(!is_optimizing()); 1822 ASSERT(!is_optimizing());
1822 frame_state_.TruncateTo(0); 1823 frame_state_.TruncateTo(0);
1823 } 1824 }
1824 #endif 1825 #endif
1825 1826
1826 1827
1827 } // namespace dart 1828 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/vm/dart_api_impl.cc ('k') | runtime/vm/flow_graph_inliner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698