Checking for stack height equality between full codegen and hydrogen.

src/deoptimizer.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "v8.h"
 
 #include "accessors.h"
 #include "codegen.h"
 #include "deoptimizer.h"
 #include "disasm.h"
@@ skipping 669 matching lines @@
       addr < start ||
       addr >= start + (kMaxNumberOfEntries * table_entry_size_)) {
     return kNotDeoptimizationEntry;
   }
   ASSERT_EQ(0,
             static_cast<int>(addr - start) % table_entry_size_);
   return static_cast<int>(addr - start) / table_entry_size_;
 }
 
 
-int Deoptimizer::GetOutputInfo(DeoptimizationOutputData* data,
-                               BailoutId id,
-                               SharedFunctionInfo* shared) {
+int Deoptimizer::GetOutputInfoIndex(
+    DeoptimizationOutputData* data,
+    BailoutId id,
+    SharedFunctionInfo* shared) {
   // TODO(kasperl): For now, we do a simple linear search for the PC
   // offset associated with the given node id. This should probably be
   // changed to a binary search.
   int length = data->DeoptPoints();
   for (int i = 0; i < length; i++) {
     if (data->AstId(i) == id) {
-      return data->PcAndState(i)->value();
+      return i;
     }
   }
   PrintF(stderr, "[couldn't find pc offset for node=%d]\n", id.ToInt());
   PrintF(stderr, "[method: %s]\n", shared->DebugName()->ToCString().get());
   // Print the source code if available.
   HeapStringAllocator string_allocator;
   StringStream stream(&string_allocator);
   shared->SourceCodePrint(&stream, -1);
   PrintF(stderr, "[source:\n%s\n]", stream.ToCString().get());
 
   FATAL("unable to find pc offset during deoptimization");
   return -1;
 }
 
 
+int Deoptimizer::GetOutputInfo(DeoptimizationOutputData* data,
+                               BailoutId id,
+                               SharedFunctionInfo* shared) {
+  int idx = GetOutputInfoIndex(data, id, shared);
+  ASSERT(idx >= 0 && data->AstId(idx) == id);
+  return data->PcAndState(idx)->value();
+}
+
+
+#if defined(COMPARE_OPT_STACK_HEIGHT)
+int Deoptimizer::GetOutputInfoStackHeight(
+    DeoptimizationOutputData* data,
+    BailoutId id,
+    SharedFunctionInfo* shared) {
+  int idx = GetOutputInfoIndex(data, id, shared);
+  ASSERT(idx >= 0 && data->AstId(idx) == id);
+  return data->StackHeight(idx)->value();
+}
+#endif
+
+
 int Deoptimizer::GetDeoptimizedCodeCount(Isolate* isolate) {
   int length = 0;
   // Count all entries in the deoptimizing code list of every context.
   Object* context = isolate->heap()->native_contexts_list();
   while (!context->IsUndefined()) {
     Context* native_context = Context::cast(context);
     Object* element = native_context->DeoptimizedCodeListHead();
     while (!element->IsUndefined()) {
       Code* code = Code::cast(element);
       ASSERT(code->kind() == Code::OPTIMIZED_FUNCTION);
@@ skipping 2856 matching lines @@
 }
 
 
 void DeoptimizedFrameInfo::Iterate(ObjectVisitor* v) {
   v->VisitPointer(BitCast<Object**>(&function_));
   v->VisitPointers(parameters_, parameters_ + parameters_count_);
   v->VisitPointers(expression_stack_, expression_stack_ + expression_count_);
 }
 
 } }  // namespace v8::internal