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

Side by Side Diff: src/compiler/effect-control-linearizer.cc

Issue 2057063002: [turbofan] Fix bad merge. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 6 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 the V8 project authors. All rights reserved. 1 // Copyright 2015 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/compiler/effect-control-linearizer.h" 5 #include "src/compiler/effect-control-linearizer.h"
6 6
7 #include "src/code-factory.h" 7 #include "src/code-factory.h"
8 #include "src/compiler/access-builder.h" 8 #include "src/compiler/access-builder.h"
9 #include "src/compiler/js-graph.h" 9 #include "src/compiler/js-graph.h"
10 #include "src/compiler/linkage.h" 10 #include "src/compiler/linkage.h"
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 state = LowerObjectIsString(node, *effect, *control); 447 state = LowerObjectIsString(node, *effect, *control);
448 break; 448 break;
449 case IrOpcode::kObjectIsUndetectable: 449 case IrOpcode::kObjectIsUndetectable:
450 state = LowerObjectIsUndetectable(node, *effect, *control); 450 state = LowerObjectIsUndetectable(node, *effect, *control);
451 break; 451 break;
452 case IrOpcode::kStringFromCharCode: 452 case IrOpcode::kStringFromCharCode:
453 state = LowerStringFromCharCode(node, *effect, *control); 453 state = LowerStringFromCharCode(node, *effect, *control);
454 break; 454 break;
455 case IrOpcode::kCheckIf: 455 case IrOpcode::kCheckIf:
456 state = LowerCheckIf(node, frame_state, *effect, *control); 456 state = LowerCheckIf(node, frame_state, *effect, *control);
457 break;
457 case IrOpcode::kPlainPrimitiveToNumber: 458 case IrOpcode::kPlainPrimitiveToNumber:
458 state = LowerPlainPrimitiveToNumber(node, *effect, *control); 459 state = LowerPlainPrimitiveToNumber(node, *effect, *control);
459 break; 460 break;
460 case IrOpcode::kPlainPrimitiveToWord32: 461 case IrOpcode::kPlainPrimitiveToWord32:
461 state = LowerPlainPrimitiveToWord32(node, *effect, *control); 462 state = LowerPlainPrimitiveToWord32(node, *effect, *control);
462 break; 463 break;
463 case IrOpcode::kPlainPrimitiveToFloat64: 464 case IrOpcode::kPlainPrimitiveToFloat64:
464 state = LowerPlainPrimitiveToFloat64(node, *effect, *control); 465 state = LowerPlainPrimitiveToFloat64(node, *effect, *control);
465 break; 466 break;
466 default: 467 default:
(...skipping 1025 matching lines...) Expand 10 before | Expand all | Expand 10 after
1492 isolate(), graph()->zone(), callable.descriptor(), 0, flags, 1493 isolate(), graph()->zone(), callable.descriptor(), 0, flags,
1493 Operator::kNoThrow); 1494 Operator::kNoThrow);
1494 to_number_operator_.set(common()->Call(desc)); 1495 to_number_operator_.set(common()->Call(desc));
1495 } 1496 }
1496 return to_number_operator_.get(); 1497 return to_number_operator_.get();
1497 } 1498 }
1498 1499
1499 } // namespace compiler 1500 } // namespace compiler
1500 } // namespace internal 1501 } // namespace internal
1501 } // namespace v8 1502 } // namespace v8
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698