Revert "Make FrameStates recursive (to be used for inlining)."

src/compiler/instruction-selector-impl.h

 // Copyright 2014 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.
 
 #ifndef V8_COMPILER_INSTRUCTION_SELECTOR_IMPL_H_
 #define V8_COMPILER_INSTRUCTION_SELECTOR_IMPL_H_
 
 #include "src/compiler/instruction.h"
 #include "src/compiler/instruction-selector.h"
 #include "src/compiler/linkage.h"
@@ skipping 327 matching lines @@
   InstructionOperandVector instruction_args;
   NodeVector pushed_nodes;
 
   int input_count() const { return descriptor->InputCount(); }
 
   int frame_state_count() const { return descriptor->FrameStateCount(); }
 
   int frame_state_value_count() const {
     return (frame_state_descriptor == NULL)
                ? 0
-               : (frame_state_descriptor->total_size() +
-                  1);  // Include deopt id.
+               : (frame_state_descriptor->size() + 1);
   }
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_INSTRUCTION_SELECTOR_IMPL_H_