Reset trunk to 3.24.35.4

src/typing.cc

Index: src/typing.cc
diff --git a/src/typing.cc b/src/typing.cc
index b925dc610ffdbd666717b835129971eb6f7b0887..c7bea40ac686c662529df81b2cee779473ca6d60 100644
--- a/src/typing.cc
+++ b/src/typing.cc
@@ -323,7 +323,7 @@ void AstTyper::VisitForStatement(ForStatement* stmt) {
 void AstTyper::VisitForInStatement(ForInStatement* stmt) {
   // Collect type feedback.
   stmt->set_for_in_type(static_cast<ForInStatement::ForInType>(
-      oracle()->ForInType(stmt->ForInFeedbackSlot())));
+      oracle()->ForInType(stmt->ForInFeedbackId())));
 
   RECURSE(Visit(stmt->enumerable()));
   store_.Forget();  // Control may transfer here via looping or 'continue'.
@@ -530,9 +530,8 @@ void AstTyper::VisitCall(Call* expr) {
   // Collect type feedback.
   RECURSE(Visit(expr->expression()));
   if (!expr->expression()->IsProperty() &&
-      expr->HasCallFeedbackSlot() &&
-      oracle()->CallIsMonomorphic(expr->CallFeedbackSlot())) {
-    expr->set_target(oracle()->GetCallTarget(expr->CallFeedbackSlot()));
+      oracle()->CallIsMonomorphic(expr->CallFeedbackId())) {
+    expr->set_target(oracle()->GetCallTarget(expr->CallFeedbackId()));
   }
 
   ZoneList<Expression*>* args = expr->arguments();