Match input operand count of BranchInstr with the input location count.

vm/intermediate_language_x64.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/intermediate_language.h"
 
 #include "lib/error.h"
@@ skipping 1987 matching lines @@
       LocationSummary* locs =
           new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kCall);
       locs->set_in(0, Location::RegisterLocation(RAX));
       locs->set_in(1, Location::RegisterLocation(RCX));
       locs->set_temp(0, Location::RegisterLocation(RDX));
       return locs;
     }
     // Otherwise polymorphic dispatch.
   }
   // Call.
-  return Computation::MakeCallSummary();
+  const intptr_t kNumInputs = 2;
+  const intptr_t kNumTemps = 0;
+  LocationSummary* locs =
+      new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kCall);
+  locs->set_in(0, Location::RegisterLocation(RAX));
+  locs->set_in(1, Location::RegisterLocation(RCX));

[srdjan, 2012/08/09 19:56:49]

ditto

+  return locs;
 }
 
 
 void BranchInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   if ((kind() == Token::kEQ_STRICT) || (kind() == Token::kNE_STRICT)) {
     Register left = locs()->in(0).reg();
     Register right = locs()->in(1).reg();
     __ cmpq(left, right);
     Condition cond = (kind() == Token::kEQ_STRICT) ? EQUAL : NOT_EQUAL;
     EmitBranchOnCondition(compiler, cond);
@@ skipping 12 matching lines @@
       return;
     }
     // TODO(srdjan): Add Smi/Double, Double/Smi comparisons.
     if ((kind() == Token::kEQ) || (kind() == Token::kNE)) {
       EmitGenericEqualityCompare(compiler, *locs(), kind(), this, *ic_data(),
                                  deopt_id(), token_pos(), try_index());
       return;
     }
     // Otherwise polymorphic dispatch?
   }
+  Register left = locs()->in(0).reg();
+  Register right = locs()->in(1).reg();
+  __ pushq(left);
+  __ pushq(right);
   // Not equal is always split into '==' and negate,
   Condition branch_condition = (kind() == Token::kNE) ? NOT_EQUAL : EQUAL;
   Token::Kind call_kind = (kind() == Token::kNE) ? Token::kEQ : kind();
   const String& function_name =
       String::ZoneHandle(Symbols::New(Token::Str(call_kind)));
   compiler->AddCurrentDescriptor(PcDescriptors::kDeopt,
                                  deopt_id(),
                                  token_pos(),
                                  try_index());
   const intptr_t kNumArguments = 2;
   const intptr_t kNumArgsChecked = 2;  // Type-feedback.
   compiler->GenerateInstanceCall(deopt_id(),
                                  token_pos(),
                                  try_index(),
                                  function_name,
                                  kNumArguments,
                                  Array::ZoneHandle(),  // No optional arguments.
                                  kNumArgsChecked);
-  ASSERT(locs()->out().reg() == RAX);
-  __ CompareObject(locs()->out().reg(), compiler->bool_true());
+  __ CompareObject(RAX, compiler->bool_true());
   EmitBranchOnCondition(compiler, branch_condition);
 }
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64