Collect type information based on stack allocated values for OSR.

src/typing.h

 // Copyright 2013 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 40 matching lines @@
     return zone->New(static_cast<int>(size));
   }
   void operator delete(void* pointer, Zone* zone) { }
   void operator delete(void* pointer) { }
 
   DEFINE_AST_VISITOR_SUBCLASS_MEMBERS();
 
  private:
   explicit AstTyper(CompilationInfo* info);
 
+  Effect ObservedOnStack(Object* value);
+  void ObserveTypesAtOsrEntry(IterationStatement* stmt);
+
   static const int kNoVar = INT_MIN;
   typedef v8::internal::Effects<int, kNoVar> Effects;
   typedef v8::internal::NestedEffects<int, kNoVar> Store;
 
   CompilationInfo* info_;
   TypeFeedbackOracle oracle_;
   Store store_;
 
   TypeFeedbackOracle* oracle() { return &oracle_; }
   Zone* zone() const { return info_->zone(); }
 
   void NarrowType(Expression* e, Bounds b) {
     e->set_bounds(Bounds::Both(e->bounds(), b, isolate_));
   }
   void NarrowLowerType(Expression* e, Handle<Type> t) {
     e->set_bounds(Bounds::NarrowLower(e->bounds(), t, isolate_));
   }
 
   Effects EnterEffects() {
     store_ = store_.Push();
     return store_.Top();
   }
   void ExitEffects() { store_ = store_.Pop(); }
 
+  inline int parameter_index(int index) { return -index - 2; }
+  inline int stack_local_index(int index) { return index; }

[rossberg, 2013/12/16 11:49:44]

Nit: the 'inline' is redundant here.

Is there much of a reason to have these as separate helpers anyway?

[Yang, 2013/12/16 11:58:35]

Removed 'inline'.

I use them in case where I don't have the pointer to the Variable, but know the
index and variable type.

+
   int variable_index(Variable* var) {
     // Stack locals have the range [0 .. l]
     // Parameters have the range [-1 .. p]
     // We map this to [-p-2 .. -1, 0 .. l]
-    return var->IsStackLocal() ? var->index() :
-           var->IsParameter() ? -var->index() - 2 : kNoVar;
+    return var->IsStackLocal() ? stack_local_index(var->index()) :
+           var->IsParameter() ? parameter_index(var->index()) : kNoVar;
   }
 
   void VisitDeclarations(ZoneList<Declaration*>* declarations);
   void VisitStatements(ZoneList<Statement*>* statements);
 
 #define DECLARE_VISIT(type) virtual void Visit##type(type* node);
   AST_NODE_LIST(DECLARE_VISIT)
 #undef DECLARE_VISIT
 
   DISALLOW_COPY_AND_ASSIGN(AstTyper);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_TYPING_H_