[v8-dev] [v8] r6493 committed - Change the default implementation of DataEquals for Hydrogen instructi...

Wed, 26 Jan 2011 06:52:14 -0800 

Revision: 6493
Author: [email protected]
Date: Wed Jan 26 06:51:21 2011
Log: Change the default implementation of DataEquals for Hydrogen instructions. 

The former default was true. The new default is false and the default
implementation is UNREACHABLE so it asserts in debug builds.  The function
is overridden in all concrete instruction classes that might have the flag
kUseGVN set.

Review URL: http://codereview.chromium.org/6255013
http://code.google.com/p/v8/source/detail?r=6493

Modified:
 /branches/bleeding_edge/src/hydrogen-instructions.cc
 /branches/bleeding_edge/src/hydrogen-instructions.h

=======================================

--- /branches/bleeding_edge/src/hydrogen-instructions.cc	Thu Jan 20  
04:56:34 2011
+++ /branches/bleeding_edge/src/hydrogen-instructions.cc	Wed Jan 26  
06:51:21 2011

@@ -490,7 +490,7 @@


 #ifdef DEBUG
-void HInstruction::Verify() const {
+void HInstruction::Verify() {
   // Verify that input operands are defined before use.
   HBasicBlock* cur_block = block();
   for (int i = 0; i < OperandCount(); ++i) {
@@ -517,6 +517,11 @@
   if (HasSideEffects() && !IsOsrEntry()) {
     ASSERT(next()->IsSimulate());
   }
+
+  // Verify that instructions that can be eliminated by GVN have overridden
+  // HValue::DataEquals.  The default implementation is UNREACHABLE.  We
+  // don't actually care whether DataEquals returns true or false here.
+  if (CheckFlag(kUseGVN)) DataEquals(this);
 }
 #endif

@@ -1388,7 +1393,7 @@
 // Node-specific verification code is only included in debug mode.
 #ifdef DEBUG

-void HPhi::Verify() const {
+void HPhi::Verify() {
   ASSERT(OperandCount() == block()->predecessors()->length());
   for (int i = 0; i < OperandCount(); ++i) {
     HValue* value = OperandAt(i);
@@ -1400,49 +1405,49 @@
 }


-void HSimulate::Verify() const {
+void HSimulate::Verify() {
   HInstruction::Verify();
   ASSERT(HasAstId());
 }


-void HBoundsCheck::Verify() const {
+void HBoundsCheck::Verify() {
   HInstruction::Verify();
   ASSERT(HasNoUses());
 }


-void HCheckSmi::Verify() const {
+void HCheckSmi::Verify() {
   HInstruction::Verify();
   ASSERT(HasNoUses());
 }


-void HCheckNonSmi::Verify() const {
+void HCheckNonSmi::Verify() {
   HInstruction::Verify();
   ASSERT(HasNoUses());
 }


-void HCheckInstanceType::Verify() const {
+void HCheckInstanceType::Verify() {
   HInstruction::Verify();
   ASSERT(HasNoUses());
 }


-void HCheckMap::Verify() const {
+void HCheckMap::Verify() {
   HInstruction::Verify();
   ASSERT(HasNoUses());
 }


-void HCheckFunction::Verify() const {
+void HCheckFunction::Verify() {
   HInstruction::Verify();
   ASSERT(HasNoUses());
 }


-void HCheckPrototypeMaps::Verify() const {
+void HCheckPrototypeMaps::Verify() {
   HInstruction::Verify();
   ASSERT(HasNoUses());
 }
=======================================

--- /branches/bleeding_edge/src/hydrogen-instructions.h	Wed Jan 26 05:37:51  
2011
+++ /branches/bleeding_edge/src/hydrogen-instructions.h	Wed Jan 26 06:51:21  
2011

@@ -713,11 +713,16 @@

   void InsertInputConversion(HInstruction* previous, int index, HType  
type);


 #ifdef DEBUG
-  virtual void Verify() const = 0;
+  virtual void Verify() = 0;
 #endif

  protected:
-  virtual bool DataEquals(HValue* other) const { return true; }

+  // This function must be overridden for instructions with flag kUseGVN,  
to

+  // compare the non-Operand parts of the instruction.
+  virtual bool DataEquals(HValue* other) const {
+    UNREACHABLE();
+    return false;
+  }
   virtual void RepresentationChanged(Representation to) { }
   virtual Range* InferRange();
   virtual void DeleteFromGraph() = 0;
@@ -773,7 +778,7 @@
   virtual LInstruction* CompileToLithium(LChunkBuilder* builder) = 0;

 #ifdef DEBUG
-  virtual void Verify() const;
+  virtual void Verify();
 #endif

   // Returns whether this is some kind of deoptimizing check
@@ -1062,7 +1067,7 @@
   DECLARE_CONCRETE_INSTRUCTION(Simulate, "simulate")

 #ifdef DEBUG
-  virtual void Verify() const;
+  virtual void Verify();
 #endif

  protected:
@@ -1158,6 +1163,9 @@
   }

   DECLARE_CONCRETE_INSTRUCTION(GlobalObject, "global_object")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -1170,6 +1178,9 @@
   }

   DECLARE_CONCRETE_INSTRUCTION(GlobalReceiver, "global_receiver")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -1360,6 +1371,9 @@
   }

   DECLARE_CONCRETE_INSTRUCTION(JSArrayLength, "js_array_length")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -1376,6 +1390,9 @@
   }

   DECLARE_CONCRETE_INSTRUCTION(FixedArrayLength, "fixed_array_length")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -1393,6 +1410,9 @@
   virtual HType CalculateInferredType() const;

   DECLARE_CONCRETE_INSTRUCTION(BitNot, "bit_not")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -1488,6 +1508,9 @@
   }

   DECLARE_CONCRETE_INSTRUCTION(LoadElements, "load-elements")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -1509,7 +1532,7 @@
   virtual HType CalculateInferredType() const;

 #ifdef DEBUG
-  virtual void Verify() const;
+  virtual void Verify();
 #endif

   Handle<Map> map() const { return map_; }
@@ -1544,7 +1567,7 @@
   virtual HType CalculateInferredType() const;

 #ifdef DEBUG
-  virtual void Verify() const;
+  virtual void Verify();
 #endif

   Handle<JSFunction> target() const { return target_; }
@@ -1586,7 +1609,7 @@
   }

 #ifdef DEBUG
-  virtual void Verify() const;
+  virtual void Verify();
 #endif

   static HCheckInstanceType* NewIsJSObjectOrJSFunction(HValue* value);
@@ -1627,10 +1650,13 @@
   virtual HType CalculateInferredType() const;

 #ifdef DEBUG
-  virtual void Verify() const;
+  virtual void Verify();
 #endif

   DECLARE_CONCRETE_INSTRUCTION(CheckNonSmi, "check_non_smi")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -1645,7 +1671,7 @@
   virtual bool IsCheckInstruction() const { return true; }

 #ifdef DEBUG
-  virtual void Verify() const;
+  virtual void Verify();
 #endif

   Handle<JSObject> prototype() const { return prototype_; }
@@ -1688,10 +1714,13 @@
   virtual HType CalculateInferredType() const;

 #ifdef DEBUG
-  virtual void Verify() const;
+  virtual void Verify();
 #endif

   DECLARE_CONCRETE_INSTRUCTION(CheckSmi, "check_smi")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -1744,7 +1773,7 @@
   virtual void PrintTo(StringStream* stream) const;

 #ifdef DEBUG
-  virtual void Verify() const;
+  virtual void Verify();
 #endif

   DECLARE_INSTRUCTION(Phi)
@@ -1832,7 +1861,7 @@
   }

 #ifdef DEBUG
-  virtual void Verify() const { }
+  virtual void Verify() { }
 #endif

   DECLARE_CONCRETE_INSTRUCTION(Constant, "constant")
@@ -1951,6 +1980,9 @@
   }

   DECLARE_CONCRETE_INSTRUCTION(ArgumentsElements, "arguments_elements")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -1962,6 +1994,9 @@
   }

   DECLARE_CONCRETE_INSTRUCTION(ArgumentsLength, "arguments_length")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -1997,6 +2032,8 @@
   virtual void InternalSetOperandAt(int index, HValue* value) {
     operands_[index] = value;
   }
+
+  virtual bool DataEquals(HValue* other) const { return true; }

  private:
   HOperandVector<3> operands_;
@@ -2017,13 +2054,16 @@
   }

 #ifdef DEBUG
-  virtual void Verify() const;
+  virtual void Verify();
 #endif

   HValue* index() const { return left(); }
   HValue* length() const { return right(); }

   DECLARE_CONCRETE_INSTRUCTION(BoundsCheck, "bounds_check")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -2141,6 +2181,9 @@
   virtual HType CalculateInferredType() const;

   DECLARE_CONCRETE_INSTRUCTION(CompareJSObjectEq, "compare-js-object-eq")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -2183,6 +2226,9 @@
   explicit HIsObject(HValue* value) : HUnaryPredicate(value) { }

   DECLARE_CONCRETE_INSTRUCTION(IsObject, "is_object")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -2191,6 +2237,9 @@
   explicit HIsSmi(HValue* value) : HUnaryPredicate(value) { }

   DECLARE_CONCRETE_INSTRUCTION(IsSmi, "is_smi")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -2227,6 +2276,9 @@
   explicit HHasCachedArrayIndex(HValue* value) : HUnaryPredicate(value) { }


    
DECLARE_CONCRETE_INSTRUCTION(HasCachedArrayIndex, "has_cached_array_index")

+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -2325,6 +2377,9 @@
   }

   DECLARE_CONCRETE_INSTRUCTION(Power, "power")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -2347,6 +2402,8 @@
   DECLARE_CONCRETE_INSTRUCTION(Add, "add")

  protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
+
   virtual Range* InferRange();
 };

@@ -2362,6 +2419,8 @@
   DECLARE_CONCRETE_INSTRUCTION(Sub, "sub")

  protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
+
   virtual Range* InferRange();
 };

@@ -2382,6 +2441,8 @@
   DECLARE_CONCRETE_INSTRUCTION(Mul, "mul")

  protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
+
   virtual Range* InferRange();
 };

@@ -2397,6 +2458,8 @@
   DECLARE_CONCRETE_INSTRUCTION(Mod, "mod")

  protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
+
   virtual Range* InferRange();
 };

@@ -2413,6 +2476,8 @@
   DECLARE_CONCRETE_INSTRUCTION(Div, "div")

  protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
+
   virtual Range* InferRange();
 };

@@ -2428,6 +2493,8 @@
   DECLARE_CONCRETE_INSTRUCTION(BitAnd, "bit_and")

  protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
+
   virtual Range* InferRange();
 };

@@ -2441,6 +2508,9 @@
   virtual HType CalculateInferredType() const;

   DECLARE_CONCRETE_INSTRUCTION(BitXor, "bit_xor")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -2455,6 +2525,8 @@
   DECLARE_CONCRETE_INSTRUCTION(BitOr, "bit_or")

  protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
+
   virtual Range* InferRange();
 };

@@ -2468,6 +2540,9 @@
   virtual HType CalculateInferredType() const;

   DECLARE_CONCRETE_INSTRUCTION(Shl, "shl")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -2479,6 +2554,9 @@
   virtual HType CalculateInferredType() const;

   DECLARE_CONCRETE_INSTRUCTION(Shr, "shr")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -2491,6 +2569,9 @@
   virtual HType CalculateInferredType() const;

   DECLARE_CONCRETE_INSTRUCTION(Sar, "sar")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -2615,12 +2696,6 @@
   virtual void PrintDataTo(StringStream* stream) const;

   DECLARE_CONCRETE_INSTRUCTION(StoreGlobal, "store_global")
-
- protected:
-  virtual bool DataEquals(HValue* other) const {
-    HStoreGlobal* b = HStoreGlobal::cast(other);
-    return cell_.is_identical_to(b->cell());
-  }

  private:
   Handle<JSGlobalPropertyCell> cell_;
@@ -2714,12 +2789,6 @@
   }

   DECLARE_CONCRETE_INSTRUCTION(LoadNamedGeneric, "load_named_generic")
-
- protected:
-  virtual bool DataEquals(HValue* other) const {
-    HLoadNamedGeneric* b = HLoadNamedGeneric::cast(other);
-    return name_.is_identical_to(b->name_);
-  }

  private:
   Handle<Object> name_;
@@ -2742,6 +2811,9 @@
   }


    
DECLARE_CONCRETE_INSTRUCTION(LoadFunctionPrototype, "load_function_prototype")

+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -2778,6 +2850,9 @@

   DECLARE_CONCRETE_INSTRUCTION(LoadKeyedFastElement,
                                "load_keyed_fast_element")
+
+ protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
 };


@@ -2819,12 +2894,6 @@
   }

   DECLARE_INSTRUCTION(StoreNamed)
-
- protected:
-  virtual bool DataEquals(HValue* other) const {
-    HStoreNamed* b = HStoreNamed::cast(other);
-    return name_.is_identical_to(b->name_);
-  }

  private:
   Handle<Object> name_;
@@ -2956,8 +3025,6 @@
     return (index == 1) ? Representation::Integer32()
         : Representation::Tagged();
   }
-
-  virtual bool DataEquals(HValue* other) const { return true; }

   HValue* string() const { return OperandAt(0); }
   HValue* index() const { return OperandAt(1); }
@@ -2965,6 +3032,8 @@
   DECLARE_CONCRETE_INSTRUCTION(StringCharCodeAt, "string_char_code_at")

  protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
+
   virtual Range* InferRange() {
     return new Range(0, String::kMaxUC16CharCode);
   }
@@ -2986,12 +3055,12 @@
     STATIC_ASSERT(String::kMaxLength <= Smi::kMaxValue);
     return HType::Smi();
   }
-
-  virtual bool DataEquals(HValue* other) const { return true; }

   DECLARE_CONCRETE_INSTRUCTION(StringLength, "string_length")

  protected:
+  virtual bool DataEquals(HValue* other) const { return true; }
+
   virtual Range* InferRange() {
     return new Range(0, String::kMaxLength);
   }

--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev














    











					Reply via email to