Enable stub generation using Hydrogen/Lithium (again)

src/hydrogen-instructions.cc

 // 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 361 matching lines @@
   bool result = DataEquals(other);
   ASSERT(!result || Hashcode() == other->Hashcode());
   return result;
 }
 
 
 intptr_t HValue::Hashcode() {
   intptr_t result = opcode();
   int count = OperandCount();
   for (int i = 0; i < count; ++i) {
-    result = result * 19 + OperandAt(i)->id() + (result >> 7);
+    HValue* operand = OperandAt(i);

[Jakob Kummerow, 2012/11/19 12:36:00]

as discussed, just pass in any existing HValue as fake dependency, so you don't
need this code.
If you do keep it, replace OperandAt(i) below with |operand| ;-)

[danno, 2012/11/26 17:16:18]

Done.

+    if (operand != NULL) {
+      result = result * 19 + OperandAt(i)->id() + (result >> 7);
+    } else {
+      result = result * 19 + (result >> 7);
+    }
   }
   return result;
 }
 
 
 const char* HValue::Mnemonic() const {
   switch (opcode()) {
 #define MAKE_CASE(type) case k##type: return #type;
     HYDROGEN_CONCRETE_INSTRUCTION_LIST(MAKE_CASE)
 #undef MAKE_CASE
@@ skipping 537 matching lines @@
   stream->Add(" %s to %s", from().Mnemonic(), to().Mnemonic());
 
   if (CanTruncateToInt32()) stream->Add(" truncating-int32");
   if (CheckFlag(kBailoutOnMinusZero)) stream->Add(" -0?");
   if (CheckFlag(kDeoptimizeOnUndefined)) stream->Add(" deopt-on-undefined");
 }
 
 
 void HJSArrayLength::PrintDataTo(StringStream* stream) {
   value()->PrintNameTo(stream);
-  stream->Add(" ");
-  typecheck()->PrintNameTo(stream);
+  if (typecheck() != NULL) {
+    stream->Add(" ");
+    typecheck()->PrintNameTo(stream);
+  }
 }
 
 
 HValue* HUnaryMathOperation::Canonicalize() {
   if (op() == kMathFloor) {
     // If the input is integer32 then we replace the floor instruction
     // with its input. This happens before the representation changes are
     // introduced.
     if (value()->representation().IsInteger32()) return value();
 
@@ skipping 92 matching lines @@
       return;
     default:
       UNREACHABLE();
   }
 }
 
 
 void HLoadElements::PrintDataTo(StringStream* stream) {
   value()->PrintNameTo(stream);
   stream->Add(" ");
-  typecheck()->PrintNameTo(stream);
+  if (typecheck() != NULL) {
+    typecheck()->PrintNameTo(stream);
+  }
 }
 
 
 void HCheckMaps::PrintDataTo(StringStream* stream) {
   value()->PrintNameTo(stream);
   stream->Add(" [%p", *map_set()->first());
   for (int i = 1; i < map_set()->length(); ++i) {
     stream->Add(",%p", *map_set()->at(i));
   }
   stream->Add("]");
@@ skipping 781 matching lines @@
     ASSERT(elements_kind() >= FIRST_EXTERNAL_ARRAY_ELEMENTS_KIND &&
            elements_kind() <= LAST_EXTERNAL_ARRAY_ELEMENTS_KIND);
     elements()->PrintNameTo(stream);
     stream->Add(".");
     stream->Add(ElementsKindToString(elements_kind()));
   }
 
   stream->Add("[");
   key()->PrintNameTo(stream);
   stream->Add("] ");
-  dependency()->PrintNameTo(stream);
+  if (dependency() != NULL) {
+    dependency()->PrintNameTo(stream);
+  }
   if (RequiresHoleCheck()) {
     stream->Add(" check_hole");
   }
 }
 
 
 bool HLoadKeyed::RequiresHoleCheck() const {
   if (IsFastPackedElementsKind(elements_kind())) {
     return false;
   }
@@ skipping 658 matching lines @@
 
 
 void HCheckFunction::Verify() {
   HInstruction::Verify();
   ASSERT(HasNoUses());
 }
 
 #endif
 
 } }  // namespace v8::internal