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

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

Issue 1107663002: Fix http://dartbug.com/23290 (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 5 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « runtime/vm/deopt_instructions.cc ('k') | runtime/vm/object.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/flow_graph_inliner.h" 5 #include "vm/flow_graph_inliner.h"
6 6
7 #include "vm/block_scheduler.h" 7 #include "vm/block_scheduler.h"
8 #include "vm/compiler.h" 8 #include "vm/compiler.h"
9 #include "vm/flags.h" 9 #include "vm/flags.h"
10 #include "vm/flow_graph.h" 10 #include "vm/flow_graph.h"
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
678 // Install bailout jump. 678 // Install bailout jump.
679 LongJumpScope jump; 679 LongJumpScope jump;
680 if (setjmp(*jump.Set()) == 0) { 680 if (setjmp(*jump.Set()) == 0) {
681 // Parse the callee function. 681 // Parse the callee function.
682 bool in_cache; 682 bool in_cache;
683 ParsedFunction* parsed_function; 683 ParsedFunction* parsed_function;
684 { 684 {
685 TimerScope timer(FLAG_compiler_stats, 685 TimerScope timer(FLAG_compiler_stats,
686 &CompilerStats::graphinliner_parse_timer, 686 &CompilerStats::graphinliner_parse_timer,
687 isolate()); 687 isolate());
688 Compiler::EnsureUnoptimizedCode(Thread::Current(), function); 688 const Error& error = Error::Handle(Z,
689 Compiler::EnsureUnoptimizedCode(Thread::Current(), function));
690 if (!error.IsNull()) {
691 Exceptions::PropagateError(error);
692 }
689 parsed_function = GetParsedFunction(function, &in_cache); 693 parsed_function = GetParsedFunction(function, &in_cache);
690 } 694 }
691 695
692 // Load IC data for the callee. 696 // Load IC data for the callee.
693 ZoneGrowableArray<const ICData*>* ic_data_array = 697 ZoneGrowableArray<const ICData*>* ic_data_array =
694 new(Z) ZoneGrowableArray<const ICData*>(); 698 new(Z) ZoneGrowableArray<const ICData*>();
695 function.RestoreICDataMap(ic_data_array); 699 function.RestoreICDataMap(ic_data_array);
696 700
697 // Build the callee graph. 701 // Build the callee graph.
698 InlineExitCollector* exit_collector = 702 InlineExitCollector* exit_collector =
(...skipping 1178 matching lines...) Expand 10 before | Expand all | Expand 10 after
1877 intptr_t FlowGraphInliner::NextInlineId(const Function& function, 1881 intptr_t FlowGraphInliner::NextInlineId(const Function& function,
1878 intptr_t parent_id) { 1882 intptr_t parent_id) {
1879 const intptr_t id = inline_id_to_function_->length(); 1883 const intptr_t id = inline_id_to_function_->length();
1880 inline_id_to_function_->Add(&function); 1884 inline_id_to_function_->Add(&function);
1881 caller_inline_id_->Add(parent_id); 1885 caller_inline_id_->Add(parent_id);
1882 return id; 1886 return id;
1883 } 1887 }
1884 1888
1885 1889
1886 } // namespace dart 1890 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/vm/deopt_instructions.cc ('k') | runtime/vm/object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698