Introduce Definition and Use types.

runtime/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 359 matching lines @@
 void FlowGraphCompiler::LoadValue(Register dst, Value* value) {
   if (value->IsConstant()) {
     ConstantVal* constant = value->AsConstant();
     if (constant->value().IsSmi()) {
       int64_t imm = reinterpret_cast<int64_t>(constant->value().raw());
       __ movq(dst, Immediate(imm));
     } else {
       __ LoadObject(dst, value->AsConstant()->value());
     }
   } else {
-    ASSERT(value->IsTemp());
+    ASSERT(value->IsTemp() || value->IsUse());
     __ popq(dst);
   }
 }
 
 
 void FlowGraphCompiler::VisitTemp(TempVal* val) {
   LoadValue(RAX, val);
 }
 
 
+void FlowGraphCompiler::VisitUse(UseVal* val) {
+  LoadValue(RAX, val);
+}
+
+
 void FlowGraphCompiler::VisitConstant(ConstantVal* val) {
   LoadValue(RAX, val);
 }
 
 
 void FlowGraphCompiler::VisitAssertAssignable(AssertAssignableComp* comp) {
   if (comp->instantiator_type_arguments() != NULL) {
     __ popq(RDX);
   }
   LoadValue(RAX, comp->value());
@@ skipping 33 matching lines @@
 // 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) {
     TempVal* temp = comp->ArgumentAt(i)->AsTemp();
-    if (temp == NULL) return false;
+    UseVal* use = comp->ArgumentAt(i)->AsUse();
+    if (temp == NULL && use == NULL) return false;

[srdjan, 2012/04/24 22:02:18]

Use parenthesis

[Kevin Millikin (Google), 2012/04/25 08:50:51]

Done.  Thanks for the reminder.

+    intptr_t current =
+        (temp != NULL) ? temp->index() : use->definition()->temp_index();
     if (i != 0) {
-      if (temp->index() != previous + 1) return false;
+      if (current != previous + 1) return false;

[srdjan, 2012/04/24 22:02:18]

ditto

[Kevin Millikin (Google), 2012/04/25 08:50:51]

Done.

     }
-    previous = temp->index();
+    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->IsTemp() && v2->IsTemp()) {
     return (v1->AsTemp()->index() + 1) == v2->AsTemp()->index();
   }
@@ skipping 721 matching lines @@
                                          assembler_->CodeSize());
   }
 }
 
 
 void FlowGraphCompiler::VisitPickTemp(PickTempInstr* instr) {
   // Semantics is to copy a stack-allocated temporary to the top of stack.
   // Destination index d is assumed the new top of stack after the
   // operation, so d-1 is the current top of stack and so d-s-1 is the
   // offset to source index s.
-  intptr_t offset = instr->destination() - instr->source() - 1;
+  intptr_t offset = instr->temp_index() - instr->source() - 1;
   ASSERT(offset >= 0);
   __ pushq(Address(RSP, offset * kWordSize));
 }
 
 
 void FlowGraphCompiler::VisitTuckTemp(TuckTempInstr* instr) {
   // Semantics is to assign to a stack-allocated temporary a copy of the top
   // of stack.  Source index s is assumed the top of stack, s-d is the
   // offset to destination index d.
   intptr_t offset = instr->source() - instr->destination();
@@ skipping 513 matching lines @@
   ASSERT(exception_handlers_list_ != NULL);
   const ExceptionHandlers& handlers = ExceptionHandlers::Handle(
       exception_handlers_list_->FinalizeExceptionHandlers(code.EntryPoint()));
   code.set_exception_handlers(handlers);
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64