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

Side by Side Diff: src/hydrogen-osr.cc

Issue 19528003: Unify SoftDeoptimize and Deoptimize hydrogen instructions (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Review feedback Created 7 years, 5 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 | « src/hydrogen-instructions.cc ('k') | src/ia32/lithium-codegen-ia32.h » ('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 2013 the V8 project authors. All rights reserved. 1 // Copyright 2013 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 87
88 if (first_expression_index != length) { 88 if (first_expression_index != length) {
89 environment->Drop(length - first_expression_index); 89 environment->Drop(length - first_expression_index);
90 for (int i = first_expression_index; i < length; ++i) { 90 for (int i = first_expression_index; i < length; ++i) {
91 HUnknownOSRValue* osr_value = builder_->Add<HUnknownOSRValue>(); 91 HUnknownOSRValue* osr_value = builder_->Add<HUnknownOSRValue>();
92 environment->Push(osr_value); 92 environment->Push(osr_value);
93 osr_values_->Add(osr_value, zone); 93 osr_values_->Add(osr_value, zone);
94 } 94 }
95 } 95 }
96 96
97 builder_->AddSimulate(osr_entry_id); 97 builder_->Add<HSimulate>(osr_entry_id);
98 builder_->Add<HOsrEntry>(osr_entry_id); 98 builder_->Add<HOsrEntry>(osr_entry_id);
99 HContext* context = builder_->Add<HContext>(); 99 HContext* context = builder_->Add<HContext>();
100 environment->BindContext(context); 100 environment->BindContext(context);
101 builder_->current_block()->Goto(loop_predecessor); 101 builder_->current_block()->Goto(loop_predecessor);
102 loop_predecessor->SetJoinId(statement->EntryId()); 102 loop_predecessor->SetJoinId(statement->EntryId());
103 builder_->set_current_block(loop_predecessor); 103 builder_->set_current_block(loop_predecessor);
104 104
105 // Create the final loop entry 105 // Create the final loop entry
106 osr_loop_entry_ = BuildLoopEntry(); 106 osr_loop_entry_ = BuildLoopEntry();
107 return osr_loop_entry_; 107 return osr_loop_entry_;
108 } 108 }
109 109
110 110
111 void HOsrBuilder::FinishGraph() { 111 void HOsrBuilder::FinishGraph() {
112 // do nothing for now. 112 // do nothing for now.
113 } 113 }
114 114
115 115
116 void HOsrBuilder::FinishOsrValues() { 116 void HOsrBuilder::FinishOsrValues() {
117 const ZoneList<HPhi*>* phis = osr_loop_entry_->phis(); 117 const ZoneList<HPhi*>* phis = osr_loop_entry_->phis();
118 for (int j = 0; j < phis->length(); j++) { 118 for (int j = 0; j < phis->length(); j++) {
119 HPhi* phi = phis->at(j); 119 HPhi* phi = phis->at(j);
120 osr_values_->at(phi->merged_index())->set_incoming_value(phi); 120 osr_values_->at(phi->merged_index())->set_incoming_value(phi);
121 } 121 }
122 } 122 }
123 123
124 } } // namespace v8::internal 124 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/hydrogen-instructions.cc ('k') | src/ia32/lithium-codegen-ia32.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698