Rename the Location type tags to be consistent with our current naming...

src/ia32/fast-codegen-ia32.cc

 // Copyright 2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 92 matching lines @@
     // patch with the code required by the debugger.
     __ mov(esp, ebp);
     __ pop(ebp);
     __ ret((fun->scope()->num_parameters() + 1) * kPointerSize);
   }
 }
 
 
 void FastCodeGenerator::Move(Location destination, Slot* source) {
   switch (destination.type()) {
-    case Location::UNINITIALIZED:
+    case Location::kUninitialized:
       UNREACHABLE();
-    case Location::EFFECT:
+    case Location::kEffect:
       break;
-    case Location::VALUE:
+    case Location::kValue:
       __ push(Operand(ebp, SlotOffset(source)));
       break;
   }
 }
 
 
 void FastCodeGenerator::Move(Location destination, Literal* expr) {
   switch (destination.type()) {
-    case Location::UNINITIALIZED:
+    case Location::kUninitialized:
       UNREACHABLE();
-    case Location::EFFECT:
+    case Location::kEffect:
       break;
-    case Location::VALUE:
+    case Location::kValue:
       __ push(Immediate(expr->handle()));
       break;
   }
 }
 
 
 void FastCodeGenerator::Move(Slot* destination, Location source) {
   switch (source.type()) {
-    case Location::UNINITIALIZED:  // Fall through.
-    case Location::EFFECT:
+    case Location::kUninitialized:  // Fall through.
+    case Location::kEffect:
       UNREACHABLE();
-    case Location::VALUE:
+    case Location::kValue:
       __ pop(Operand(ebp, SlotOffset(destination)));
       break;
   }
 }
 
 
 void FastCodeGenerator::DropAndMove(Location destination, Register source) {
   switch (destination.type()) {
-    case Location::UNINITIALIZED:
+    case Location::kUninitialized:
       UNREACHABLE();
-    case Location::EFFECT:
+    case Location::kEffect:
       __ add(Operand(esp), Immediate(kPointerSize));
       break;
-    case Location::VALUE:
+    case Location::kValue:
       __ mov(Operand(esp, 0), source);
       break;
   }
 }
 
 
 void FastCodeGenerator::DeclareGlobals(Handle<FixedArray> pairs) {
   // Call the runtime to declare the globals.
   __ push(esi);  // The context is the first argument.
   __ push(Immediate(pairs));
@@ skipping 178 matching lines @@
                           Smi::FromInt(0)));
         Visit(value);
         ASSERT(value->location().is_value());
         __ CallRuntime(Runtime::kDefineAccessor, 4);
         __ mov(eax, Operand(esp, 0));  // Restore result into eax.
         break;
       default: UNREACHABLE();
     }
   }
   switch (expr->location().type()) {
-    case Location::UNINITIALIZED:
+    case Location::kUninitialized:
       UNREACHABLE();
-    case Location::EFFECT:
+    case Location::kEffect:
       if (result_saved) __ add(Operand(esp), Immediate(kPointerSize));
       break;
-    case Location::VALUE:
+    case Location::kValue:
       if (!result_saved) __ push(eax);
       break;
   }
 }
 
 
 void FastCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) {
   Comment cmnt(masm_, "[ ArrayLiteral");
   Label make_clone;
 
@@ skipping 48 matching lines @@
     __ mov(ebx, Operand(esp, 0));  // Copy of array literal.
     __ mov(ebx, FieldOperand(ebx, JSObject::kElementsOffset));
     int offset = FixedArray::kHeaderSize + (i * kPointerSize);
     __ mov(FieldOperand(ebx, offset), eax);
 
     // Update the write barrier for the array store.
     __ RecordWrite(ebx, offset, eax, ecx);
   }
 
   switch (expr->location().type()) {
-    case Location::UNINITIALIZED:
+    case Location::kUninitialized:
       UNREACHABLE();
-    case Location::EFFECT:
+    case Location::kEffect:
       if (result_saved) __ add(Operand(esp), Immediate(kPointerSize));
       break;
-    case Location::VALUE:
+    case Location::kValue:
       if (!result_saved) __ push(eax);
       break;
   }
 }
 
 
 void FastCodeGenerator::VisitAssignment(Assignment* expr) {
   Comment cmnt(masm_, "[ Assignment");
   ASSERT(expr->op() == Token::ASSIGN || expr->op() == Token::INIT_VAR);
 
@@ skipping 29 matching lines @@
     if (rhs->AsLiteral() != NULL) {
       // Two cases: 'temp <- (var = constant)', or 'var = constant' with a
       // discarded result.  Always perform the assignment.
       __ mov(eax, rhs->AsLiteral()->handle());
       __ mov(Operand(ebp, SlotOffset(var->slot())), eax);
       Move(expr->location(), eax);
     } else {
       ASSERT(rhs->location().is_value());
       Visit(rhs);
       switch (expr->location().type()) {
-        case Location::UNINITIALIZED:
+        case Location::kUninitialized:
           UNREACHABLE();
-        case Location::EFFECT:
+        case Location::kEffect:
           // Case 'var = temp'.  Discard right-hand-side temporary.
           Move(var->slot(), rhs->location());
           break;
-        case Location::VALUE:
+        case Location::kValue:
           // Case 'temp1 <- (var = temp0)'.  Preserve right-hand-side
           // temporary on the stack.
           __ mov(eax, Operand(esp, 0));
           __ mov(Operand(ebp, SlotOffset(var->slot())), eax);
           break;
       }
     }
   }
 }
 
@@ skipping 24 matching lines @@
     Visit(expr->key());
     Handle<Code> ic(Builtins::builtin(Builtins::KeyedLoadIC_Initialize));
     __ call(ic, RelocInfo::CODE_TARGET);
     // By emitting a nop we make sure that we do not have a "test eax,..."
     // instruction after the call it is treated specially by the LoadIC code.
     __ nop();
     // Drop key left on the stack by IC.
     __ add(Operand(esp), Immediate(kPointerSize));
   }
   switch (expr->location().type()) {
-    case Location::UNINITIALIZED:
+    case Location::kUninitialized:
       UNREACHABLE();
-    case Location::VALUE:
+    case Location::kValue:
       __ mov(Operand(esp, 0), eax);
       break;
-    case Location::EFFECT:
+    case Location::kEffect:
       __ add(Operand(esp), Immediate(kPointerSize));
       break;
   }
 }
 
 
 void FastCodeGenerator::VisitCall(Call* expr) {
   Expression* fun = expr->expression();
   ZoneList<Expression*>* args = expr->arguments();
   Variable* var = fun->AsVariableProxy()->AsVariable();
@@ skipping 97 matching lines @@
 
   // Compile the left-hand value into eax.  Put it on the stack if we may
   // need it as the value of the whole expression.
   if (left->AsLiteral() != NULL) {
     __ mov(eax, left->AsLiteral()->handle());
     if (destination.is_value()) __ push(eax);
   } else {
     Visit(left);
     ASSERT(left->location().is_value());
     switch (destination.type()) {
-      case Location::UNINITIALIZED:
+      case Location::kUninitialized:
         UNREACHABLE();
-      case Location::EFFECT:
+      case Location::kEffect:
         // Pop the left-hand value into eax because we will not need it as the
         // final result.
         __ pop(eax);
         break;
-      case Location::VALUE:
+      case Location::kValue:
         // Copy the left-hand value into eax because we may need it as the
         // final result.
         __ mov(eax, Operand(esp, 0));
         break;
     }
   }
   // The left-hand value is in eax.  It is also on the stack iff the
   // destination location is temporary.
 
   // Perform fast checks assumed by the stub.
@@ skipping 15 matching lines @@
   __ CallStub(&stub);
   __ test(eax, Operand(eax));  // The stub returns nonzero for true.
   __ j(not_zero, &done);
 
   __ bind(&eval_right);
   // Discard the left-hand value if present on the stack.
   if (destination.is_value()) {
     __ add(Operand(esp), Immediate(kPointerSize));
   }
   // Save or discard the right-hand value as needed.
-  if (right->AsLiteral() != NULL) {
-    Move(destination, right->AsLiteral());
-  } else {
-    Visit(right);
-    Move(destination, right->location());
-  }
+  Visit(right);
+  ASSERT_EQ(destination.type(), right->location().type());
 
   __ bind(&done);
 }
 
 
 } }  // namespace v8::internal