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

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

Issue 23503025: Fix OSR to ignore phis without merge index in loop entry. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Increased test coverage as per offline discussion with Ben Titzer. Created 7 years, 3 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 | « no previous file | test/mjsunit/compiler/escape-analysis.js » ('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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 ASSERT(phi->HasMergedIndex()); 120 if (phi->HasMergedIndex()) {
121 osr_values_->at(phi->merged_index())->set_incoming_value(phi); 121 osr_values_->at(phi->merged_index())->set_incoming_value(phi);
122 }
122 } 123 }
123 } 124 }
124 125
125 } } // namespace v8::internal 126 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | test/mjsunit/compiler/escape-analysis.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698