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

Unified Diff: runtime/vm/intermediate_language.cc

Issue 15741002: Use a uniform way to emit code for all instructions. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: runtime/vm/intermediate_language.cc
diff --git a/runtime/vm/intermediate_language.cc b/runtime/vm/intermediate_language.cc
index ed56e356a6d7ea6c6c299ec5ad41eb56ced3aeb0..fc26ffeecf9132dba2ad77b3e1079fcf8f1c6d82 100644
--- a/runtime/vm/intermediate_language.cc
+++ b/runtime/vm/intermediate_language.cc
@@ -1415,8 +1415,7 @@ Instruction* CheckEitherNonSmiInstr::Canonicalize(FlowGraph* flow_graph) {
#define __ compiler->assembler()->
LocationSummary* GraphEntryInstr::MakeLocationSummary() const {
- UNREACHABLE();
- return NULL;
+ return new LocationSummary(0, 0, LocationSummary::kNoCall);
}
@@ -1426,17 +1425,11 @@ void GraphEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
LocationSummary* JoinEntryInstr::MakeLocationSummary() const {
- UNREACHABLE();
- return NULL;
+ return new LocationSummary(0, 0, LocationSummary::kNoCall);
Florian Schneider 2013/05/22 15:56:15 Is this ever called? If no, just return NULL. Othe
Kevin Millikin (Google) 2013/05/23 09:09:49 Yes, it's called by the nonoptimizing compiler. I
}
void JoinEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
- if (!compiler->is_optimizing()) {
- compiler->AddCurrentDescriptor(PcDescriptors::kDeopt,
- deopt_id_,
- Scanner::kDummyTokenIndex);
- }
__ Bind(compiler->GetJumpLabel(this));
if (HasParallelMove()) {
compiler->parallel_move_resolver()->EmitNativeCode(parallel_move());
@@ -1445,17 +1438,11 @@ void JoinEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
LocationSummary* TargetEntryInstr::MakeLocationSummary() const {
- UNREACHABLE();
- return NULL;
+ return new LocationSummary(0, 0, LocationSummary::kNoCall);
}
void TargetEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
- if (!compiler->is_optimizing()) {
- compiler->AddCurrentDescriptor(PcDescriptors::kDeopt,
- deopt_id_,
- Scanner::kDummyTokenIndex);
- }
__ Bind(compiler->GetJumpLabel(this));
if (HasParallelMove()) {
compiler->parallel_move_resolver()->EmitNativeCode(parallel_move());
@@ -1464,8 +1451,7 @@ void TargetEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
LocationSummary* CatchBlockEntryInstr::MakeLocationSummary() const {
- UNREACHABLE();
- return NULL;
+ return new LocationSummary(0, 0, LocationSummary::kNoCall);
}
@@ -1520,7 +1506,7 @@ LocationSummary* ParallelMoveInstr::MakeLocationSummary() const {
void ParallelMoveInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
- UNREACHABLE();
+ compiler->parallel_move_resolver()->EmitNativeCode(this);
}
@@ -2372,7 +2358,6 @@ InvokeMathCFunctionInstr::InvokeMathCFunctionInstr(
InstanceCallInstr* instance_call,
MethodRecognizer::Kind recognized_kind)
: inputs_(inputs),
- locs_(NULL),
recognized_kind_(recognized_kind) {
ASSERT(inputs_->length() == ArgumentCountFor(recognized_kind_));
for (intptr_t i = 0; i < inputs_->length(); ++i) {

Powered by Google App Engine
This is Rietveld 408576698