Reverting r7833 because of failing compilation.

vm/flow_graph_compiler_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/flow_graph_compiler.h"
 
 #include "lib/error.h"
@@ skipping 417 matching lines @@
                       comp->token_index(),
                       comp->try_index(),
                       kConditionTypeErrorRuntimeEntry);
   // We should never return here.
   __ int3();
 
   __ Bind(&done);
 }
 
 
+// True iff. the arguments to a call will be properly pushed and can
+// be popped after the call.
+template <typename T> static bool VerifyCallComputation(T* comp) {
+  // Argument values should be consecutive temps.
+  //
+  // TODO(kmillikin): implement stack height tracking so we can also assert
+  // they are on top of the stack.
+  intptr_t previous = -1;
+  for (int i = 0; i < comp->ArgumentCount(); ++i) {
+    Value* val = comp->ArgumentAt(i);
+    if (!val->IsUse()) return false;
+    intptr_t current = val->AsUse()->definition()->temp_index();
+    if (i != 0) {
+      if (current != (previous + 1)) return false;
+    }
+    previous = current;
+  }
+  return true;
+}
+
+
 // Truee iff. the v2 is above v1 on stack, or one of them is constant.
 static bool VerifyValues(Value* v1, Value* v2) {
   if (v1->IsUse() && v2->IsUse()) {
     return (v1->AsUse()->definition()->temp_index() + 1) ==
         v2->AsUse()->definition()->temp_index();
   }
   return true;
 }
 
 
@@ skipping 54 matching lines @@
   __ movq(RAX, CTX);
 }
 
 
 void FlowGraphCompiler::VisitStoreContext(StoreContextComp* comp) {
   LoadValue(CTX, comp->value());
 }
 
 
 void FlowGraphCompiler::VisitClosureCall(ClosureCallComp* comp) {
-  // Moved to intermediate_language_x64.cc.
-  UNREACHABLE();
+  ASSERT(VerifyCallComputation(comp));
+  // The arguments to the stub include the closure.  The arguments
+  // descriptor describes the closure's arguments (and so does not include
+  // the closure).
+  int argument_count = comp->ArgumentCount();
+  const Array& arguments_descriptor =
+      CodeGenerator::ArgumentsDescriptor(argument_count - 1,
+                                         comp->argument_names());
+  __ LoadObject(R10, arguments_descriptor);
+
+  GenerateCall(comp->token_index(),
+               comp->try_index(),
+               &StubCode::CallClosureFunctionLabel(),
+               PcDescriptors::kOther);
+  __ Drop(argument_count);
 }
 
 
 void FlowGraphCompiler::VisitInstanceCall(InstanceCallComp* comp) {
-  // Moved to intermediate_language_x64.cc.
-  UNREACHABLE();
+  ASSERT(VerifyCallComputation(comp));
+  EmitInstanceCall(comp->cid(),
+                   comp->token_index(),
+                   comp->try_index(),
+                   comp->function_name(),
+                   comp->ArgumentCount(),
+                   comp->argument_names(),
+                   comp->checked_argument_count());
 }
 
 
 void FlowGraphCompiler::VisitStrictCompare(StrictCompareComp* comp) {
   // Visitor should not be used to compile this instruction.
   // Native code template for StrictCompareComp was moved to
   // StrictCompareComp::EmitNativeCode.
   UNREACHABLE();
 }
 
@@ skipping 30 matching lines @@
                    comp->try_index(),
                    operator_name,
                    kNumberOfArguments,
                    kNoArgumentNames,
                    kNumArgumentsChecked);
   __ Bind(&done);
 }
 
 
 void FlowGraphCompiler::VisitStaticCall(StaticCallComp* comp) {
-  // Moved to intermediate_language_x64.cc.
-  UNREACHABLE();
+  ASSERT(VerifyCallComputation(comp));
+  EmitStaticCall(comp->token_index(),
+                 comp->try_index(),
+                 comp->function(),
+                 comp->ArgumentCount(),
+                 comp->argument_names());
 }
 
 
 void FlowGraphCompiler::VisitLoadLocal(LoadLocalComp* comp) {
   __ movq(RAX, Address(RBP, comp->local().index() * kWordSize));
 }
 
 
 void FlowGraphCompiler::VisitStoreLocal(StoreLocalComp* comp) {
   LoadValue(RAX, comp->value());
@@ skipping 21 matching lines @@
 }
 
 
 void FlowGraphCompiler::VisitLoadInstanceField(LoadInstanceFieldComp* comp) {
   LoadValue(RAX, comp->instance());
   __ movq(RAX, FieldAddress(RAX, comp->field().Offset()));
 }
 
 
 void FlowGraphCompiler::VisitStoreInstanceField(StoreInstanceFieldComp* comp) {
-  ASSERT(VerifyValues(comp->instance(), comp->value()));
+  VerifyValues(comp->instance(), comp->value());
   LoadValue(RDX, comp->value());
   LoadValue(RAX, comp->instance());
   __ StoreIntoObject(RAX, FieldAddress(RAX, comp->field().Offset()), RDX);
 }
 
 
 
 void FlowGraphCompiler::VisitLoadStaticField(LoadStaticFieldComp* comp) {
   __ LoadObject(RDX, comp->field());
   __ movq(RAX, FieldAddress(RDX, Field::value_offset()));
@@ skipping 1084 matching lines @@
 
 
 void FlowGraphCompiler::FinalizeComments(const Code& code) {
   code.set_comments(assembler_->GetCodeComments());
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64