Rollback of r11015, r11014, r11011, r11010 in trunk branch.

src/lithium.h

 // Copyright 2012 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 51 matching lines @@
   bool IsIgnored() const { return kind() == INVALID; }
   bool Equals(LOperand* other) const { return value_ == other->value_; }
 
   void PrintTo(StringStream* stream);
   void ConvertTo(Kind kind, int index) {
     value_ = KindField::encode(kind);
     value_ |= index << kKindFieldWidth;
     ASSERT(this->index() == index);
   }
 
-  // Calls SetUpCache() for each subclass. Don't forget to update this method
-  // if you add a new LOperand subclass.
-  static void SetUpCaches();
-
  protected:
   static const int kKindFieldWidth = 3;
   class KindField : public BitField<Kind, 0, kKindFieldWidth> { };
 
   LOperand(Kind kind, int index) { ConvertTo(kind, index); }
 
   unsigned value_;
 };
 
 
@@ skipping 175 matching lines @@
 
   static LConstantOperand* cast(LOperand* op) {
     ASSERT(op->IsConstantOperand());
     return reinterpret_cast<LConstantOperand*>(op);
   }
 
   static void SetUpCache();
 
  private:
   static const int kNumCachedOperands = 128;
-  static LConstantOperand* cache;
+  static LConstantOperand cache[];
 
   LConstantOperand() : LOperand() { }
   explicit LConstantOperand(int index) : LOperand(CONSTANT_OPERAND, index) { }
 };
 
 
 class LArgument: public LOperand {
  public:
   explicit LArgument(int index) : LOperand(ARGUMENT, index) { }
 
@@ skipping 14 matching lines @@
 
   static LStackSlot* cast(LOperand* op) {
     ASSERT(op->IsStackSlot());
     return reinterpret_cast<LStackSlot*>(op);
   }
 
   static void SetUpCache();
 
  private:
   static const int kNumCachedOperands = 128;
-  static LStackSlot* cache;
+  static LStackSlot cache[];
 
   LStackSlot() : LOperand() { }
   explicit LStackSlot(int index) : LOperand(STACK_SLOT, index) { }
 };
 
 
 class LDoubleStackSlot: public LOperand {
  public:
   static LDoubleStackSlot* Create(int index) {
     ASSERT(index >= 0);
     if (index < kNumCachedOperands) return &cache[index];
     return new LDoubleStackSlot(index);
   }
 
   static LDoubleStackSlot* cast(LOperand* op) {
     ASSERT(op->IsStackSlot());
     return reinterpret_cast<LDoubleStackSlot*>(op);
   }
 
   static void SetUpCache();
 
  private:
   static const int kNumCachedOperands = 128;
-  static LDoubleStackSlot* cache;
+  static LDoubleStackSlot cache[];
 
   LDoubleStackSlot() : LOperand() { }
   explicit LDoubleStackSlot(int index) : LOperand(DOUBLE_STACK_SLOT, index) { }
 };
 
 
 class LRegister: public LOperand {
  public:
   static LRegister* Create(int index) {
     ASSERT(index >= 0);
     if (index < kNumCachedOperands) return &cache[index];
     return new LRegister(index);
   }
 
   static LRegister* cast(LOperand* op) {
     ASSERT(op->IsRegister());
     return reinterpret_cast<LRegister*>(op);
   }
 
   static void SetUpCache();
 
  private:
   static const int kNumCachedOperands = 16;
-  static LRegister* cache;
+  static LRegister cache[];
 
   LRegister() : LOperand() { }
   explicit LRegister(int index) : LOperand(REGISTER, index) { }
 };
 
 
 class LDoubleRegister: public LOperand {
  public:
   static LDoubleRegister* Create(int index) {
     ASSERT(index >= 0);
     if (index < kNumCachedOperands) return &cache[index];
     return new LDoubleRegister(index);
   }
 
   static LDoubleRegister* cast(LOperand* op) {
     ASSERT(op->IsDoubleRegister());
     return reinterpret_cast<LDoubleRegister*>(op);
   }
 
   static void SetUpCache();
 
  private:
   static const int kNumCachedOperands = 16;
-  static LDoubleRegister* cache;
+  static LDoubleRegister cache[];
 
   LDoubleRegister() : LOperand() { }
   explicit LDoubleRegister(int index) : LOperand(DOUBLE_REGISTER, index) { }
 };
 
 
 class LParallelMove : public ZoneObject {
  public:
   LParallelMove() : move_operands_(4) { }
 
@@ skipping 214 matching lines @@
   ShallowIterator current_iterator_;
 };
 
 
 int ElementsKindToShiftSize(ElementsKind elements_kind);
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_LITHIUM_H_