Make all variants of RelationalOp work with SSA.

runtime/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 620 matching lines @@
     Register left = locs()->in(0).reg();
     Register right = locs()->in(1).reg();
     __ pushq(left);
     __ pushq(right);
     EmitEqualityAsInstanceCall(compiler, this);
   }
 }
 
 
 LocationSummary* RelationalOpComp::MakeLocationSummary() const {
+  const intptr_t kNumInputs = 2;
   if (operands_class_id() == kSmiCid || operands_class_id() == kDoubleCid) {
-    const intptr_t kNumInputs = 2;
     const intptr_t kNumTemps = 1;
     LocationSummary* summary =
         new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kNoCall);
     summary->set_in(0, Location::RequiresRegister());
     summary->set_in(1, Location::RequiresRegister());
     summary->set_out(Location::RequiresRegister());
     summary->set_temp(0, Location::RequiresRegister());
     return summary;
   }
-  return MakeCallSummary();
+  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));
+  locs->set_out(Location::RegisterLocation(RAX));
+  return locs;
 }
 
 
 void RelationalOpComp::EmitNativeCode(FlowGraphCompiler* compiler) {
   if (operands_class_id() == kSmiCid) {
     EmitSmiComparisonOp(compiler, *locs(), kind(), NULL,
                         deopt_id(), token_pos(), try_index());
     return;
   }
   if (operands_class_id() == kDoubleCid) {
     EmitDoubleComparisonOp(compiler, *locs(), kind(), NULL,
                            deopt_id(), token_pos(), try_index());
     return;
   }
   if (HasICData() && (ic_data()->NumberOfChecks() > 0)) {
     Label* deopt = compiler->AddDeoptStub(deopt_id(),
                                           try_index(),
                                           kDeoptRelationalOp);
-    // Load receiver into RAX, class into RDI.
+    // Push arguments for the call.
+    // TODO(fschneider): Split this instruction into different types to avoid
+    // explicitly pushing arguments to the call here.
+    Register left = locs()->in(0).reg();
+    Register right = locs()->in(1).reg();
+    __ pushq(left);
+    __ pushq(right);
+

[srdjan, 2012/08/15 21:48:38]

ditto

[Florian Schneider, 2012/08/16 08:30:37]

Done.

+    // Load class into RDI.
+    ASSERT((left != RDI) && (right != RDI));
     Label done;
+    __ movq(RDI, Immediate(kSmiCid));
+    __ testq(left, Immediate(kSmiTagMask));
+    __ j(ZERO, &done);
+    __ LoadClassId(RDI, left);
+    __ Bind(&done);
     const intptr_t kNumArguments = 2;
-    __ movq(RDI, Immediate(kSmiCid));
-    __ movq(RAX, Address(RSP, (kNumArguments - 1) * kWordSize));
-    __ testq(RAX, Immediate(kSmiTagMask));
-    __ j(ZERO, &done);
-    __ LoadClassId(RDI, RAX);
-    __ Bind(&done);
     compiler->EmitTestAndCall(ICData::Handle(ic_data()->AsUnaryClassChecks()),
                               RDI,  // Class id register.
                               kNumArguments,
                               Array::Handle(),  // No named arguments.
                               deopt,  // Deoptimize target.
                               NULL,   // Fallthrough when done.
                               deopt_id(),
                               token_pos(),
                               try_index(),
                               locs()->stack_bitmap());
+    ASSERT(locs()->out().reg() == RAX);
     return;
   }
+  // Push arguments to the call.
+  // TODO(fschneider): Split this instruction into different types to avoid
+  // explicitly pushing arguments to the call here.
+  Register left = locs()->in(0).reg();
+  Register right = locs()->in(1).reg();
+  __ pushq(left);
+  __ pushq(right);
+
   const String& function_name =
       String::ZoneHandle(Symbols::New(Token::Str(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(),
@@ skipping 1428 matching lines @@
                                  locs()->stack_bitmap());
   __ CompareObject(RAX, compiler->bool_true());
   EmitBranchOnCondition(compiler, branch_condition);
 }
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64