Adapt compile time constants and integrate with Kevin's CL 10302007 (Remove temporaries using expli…

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 347 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() || value->IsUse());
+    ASSERT(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);
 }
 
 
@@ skipping 35 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();
-    UseVal* use = comp->ArgumentAt(i)->AsUse();
-    if ((temp == NULL) && (use == NULL)) return false;
-    intptr_t current =
-        (temp != NULL) ? temp->index() : use->definition()->temp_index();
+    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->IsTemp() && v2->IsTemp()) {
-    return (v1->AsTemp()->index() + 1) == v2->AsTemp()->index();
+  if (v1->IsUse() && v2->IsUse()) {
+    return (v1->AsUse()->definition()->temp_index() + 1) ==
+        v2->AsUse()->definition()->temp_index();
   }
   return true;
 }
 
 
 void FlowGraphCompiler::EmitInstanceCall(intptr_t cid,
                                          intptr_t token_index,
                                          intptr_t try_index,
                                          const String& function_name,
                                          intptr_t argument_count,
@@ skipping 49 matching lines @@
   __ movq(RAX, CTX);
 }
 
 
 void FlowGraphCompiler::VisitStoreContext(StoreContextComp* comp) {
   LoadValue(CTX, comp->value());
 }
 
 
 void FlowGraphCompiler::VisitClosureCall(ClosureCallComp* comp) {
-  ASSERT(comp->context()->IsTemp() || comp->context()->IsUse());
+  ASSERT(comp->context()->IsUse());
   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);
 
@@ skipping 387 matching lines @@
   __ movq(R10, Immediate(Smi::RawValue(comp->ElementCount())));
   LoadValue(RBX, comp->element_type());
   GenerateCall(comp->token_index(),
                comp->try_index(),
                &StubCode::AllocateArrayLabel(),
                PcDescriptors::kOther);
 
   // 2. Initialize the array in RAX with the element values.
   __ leaq(RCX, FieldAddress(RAX, Array::data_offset()));
   for (int i = comp->ElementCount() - 1; i >= 0; --i) {
-    if (comp->ElementAt(i)->IsTemp()) {
+    if (comp->ElementAt(i)->IsUse()) {
       __ popq(Address(RCX, i * kWordSize));
     } else {
       LoadValue(RDX, comp->ElementAt(i));
       __ movq(Address(RCX, i * kWordSize), RDX);
     }
   }
 }
 
 
 void FlowGraphCompiler::VisitCreateClosure(CreateClosureComp* comp) {
@@ skipping 799 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