[deoptimizer] Basic support inlining based on SharedFunctionInfo.

src/deoptimizer.h

 // Copyright 2012 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_DEOPTIMIZER_H_
 #define V8_DEOPTIMIZER_H_
 
 #include "src/v8.h"
 
 #include "src/allocation.h"
@@ skipping 108 matching lines @@
     kArgumentsAdaptor,
     kConstructStub,
     kCompiledStub,
     kInvalid
   };
 
   int GetValueCount();
 
   Kind kind() const { return kind_; }
   BailoutId node_id() const { return node_id_; }
-  JSFunction* raw_function() const { return raw_function_; }
-  Handle<JSFunction> function() const { return function_; }
+  Handle<SharedFunctionInfo> shared_info() const { return shared_info_; }
   int height() const { return height_; }
 
   class iterator {
    public:
     iterator& operator++() {
       AdvanceIterator(&position_);
       return *this;
     }
 
     iterator operator++(int) {
@@ skipping 17 matching lines @@
         : position_(position) {}
 
     std::deque<TranslatedValue>::iterator position_;
   };
 
   typedef TranslatedValue& reference;
   typedef TranslatedValue const& const_reference;
 
   iterator begin() { return iterator(values_.begin()); }
   iterator end() { return iterator(values_.end()); }
+
   reference front() { return values_.front(); }
   const_reference front() const { return values_.front(); }
 
+  reference operator[](size_t index) { return values_[index]; }
+  const_reference operator[](size_t index) const { return values_[index]; }

[Jarin, 2015/06/10 11:15:04]

As discussed offline, we should not expose the values_ array because it is a
flattened array of values (i.e., fields of captured objects appear in the
array), so indexing does not do what you think it should do.

[Benedikt Meurer, 2015/06/10 11:19:50]

Done.

+
+  size_t size() const { return values_.size(); }

[Jarin, 2015/06/10 11:15:04]

Remove this. You should use the GetValueCount method.

[Benedikt Meurer, 2015/06/10 11:19:50]

Done.

+
  private:
   friend class TranslatedState;
 
   // Constructor static methods.
-  static TranslatedFrame JSFrame(BailoutId node_id, JSFunction* function,
-                                 int height);
-  static TranslatedFrame AccessorFrame(Kind kind, JSFunction* function);
-  static TranslatedFrame ArgumentsAdaptorFrame(JSFunction* function,
+  static TranslatedFrame JSFrame(BailoutId node_id,
+                                 SharedFunctionInfo* shared_info, int height);
+  static TranslatedFrame AccessorFrame(Kind kind,
+                                       SharedFunctionInfo* shared_info);
+  static TranslatedFrame ArgumentsAdaptorFrame(SharedFunctionInfo* shared_info,
                                                int height);
-  static TranslatedFrame ConstructStubFrame(JSFunction* function, int height);
+  static TranslatedFrame ConstructStubFrame(SharedFunctionInfo* shared_info,
+                                            int height);
   static TranslatedFrame CompiledStubFrame(int height, Isolate* isolate) {
     return TranslatedFrame(kCompiledStub, isolate, nullptr, height);
   }
   static TranslatedFrame InvalidFrame() {
     return TranslatedFrame(kInvalid, nullptr);
   }
 
   static void AdvanceIterator(std::deque<TranslatedValue>::iterator* iter);
 
-  TranslatedFrame(Kind kind, Isolate* isolate, JSFunction* function = nullptr,
-                  int height = 0)
+  TranslatedFrame(Kind kind, Isolate* isolate,
+                  SharedFunctionInfo* shared_info = nullptr, int height = 0)
       : kind_(kind),
         node_id_(BailoutId::None()),
-        raw_function_(function),
+        raw_shared_info_(shared_info),
         height_(height),
         isolate_(isolate) {}
 
 
   void Add(const TranslatedValue& value) { values_.push_back(value); }
-  void Handlify(Isolate* isolate);
+  void Handlify();
 
   Kind kind_;
   BailoutId node_id_;
-  JSFunction* raw_function_;
-  Handle<JSFunction> function_;
+  SharedFunctionInfo* raw_shared_info_;
+  Handle<SharedFunctionInfo> shared_info_;
   int height_;
   Isolate* isolate_;
 
   typedef std::deque<TranslatedValue> ValuesContainer;
 
   ValuesContainer values_;
 };
 
 
 // Auxiliary class for translating deoptimization values.
@@ skipping 792 matching lines @@
   V(REGISTER)                      \
   V(INT32_REGISTER)                \
   V(UINT32_REGISTER)               \
   V(BOOL_REGISTER)                 \
   V(DOUBLE_REGISTER)               \
   V(STACK_SLOT)                    \
   V(INT32_STACK_SLOT)              \
   V(UINT32_STACK_SLOT)             \
   V(BOOL_STACK_SLOT)               \
   V(DOUBLE_STACK_SLOT)             \
-  V(LITERAL)
+  V(LITERAL)                       \
+  V(JS_FRAME_FUNCTION)
 
 
 class Translation BASE_EMBEDDED {
  public:
 #define DECLARE_TRANSLATION_OPCODE_ENUM(item) item,
   enum Opcode {
     TRANSLATION_OPCODE_LIST(DECLARE_TRANSLATION_OPCODE_ENUM)
     LAST = LITERAL
   };
 #undef DECLARE_TRANSLATION_OPCODE_ENUM
@@ skipping 25 matching lines @@
   void StoreUint32Register(Register reg);
   void StoreBoolRegister(Register reg);
   void StoreDoubleRegister(DoubleRegister reg);
   void StoreStackSlot(int index);
   void StoreInt32StackSlot(int index);
   void StoreUint32StackSlot(int index);
   void StoreBoolStackSlot(int index);
   void StoreDoubleStackSlot(int index);
   void StoreLiteral(int literal_id);
   void StoreArgumentsObject(bool args_known, int args_index, int args_length);
+  void StoreJSFrameFunction();
 
   Zone* zone() const { return zone_; }
 
   static int NumberOfOperandsFor(Opcode opcode);
 
 #if defined(OBJECT_PRINT) || defined(ENABLE_DISASSEMBLER)
   static const char* StringFor(Opcode opcode);
 #endif
 
-  // A literal id which refers to the JSFunction itself.
-  static const int kSelfLiteralId = -239;
-
  private:
   TranslationBuffer* buffer_;
   int index_;
   Zone* zone_;
 };
 
 
 class MaterializedObjectStore {
  public:
   explicit MaterializedObjectStore(Isolate* isolate) : isolate_(isolate) {
@@ skipping 90 matching lines @@
   Object** expression_stack_;
   int source_position_;
 
   friend class Deoptimizer;
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_DEOPTIMIZER_H_