[type profile] Collect return types.

src/interpreter/bytecode-generator.cc

 // Copyright 2015 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 "src/interpreter/bytecode-generator.h"
 
 #include "src/ast/compile-time-value.h"
 #include "src/ast/scopes.h"
 #include "src/builtins/builtins-constructor.h"
 #include "src/code-stubs.h"
@@ skipping 1075 matching lines @@
 
 void BytecodeGenerator::VisitBreakStatement(BreakStatement* stmt) {
   builder()->SetStatementPosition(stmt);
   execution_control()->Break(stmt->target());
 }
 
 void BytecodeGenerator::VisitReturnStatement(ReturnStatement* stmt) {
   builder()->SetStatementPosition(stmt);
   VisitForAccumulatorValue(stmt->expression());
 
+  if (stmt->HasTypeProfileSlot()) {
+    FeedbackSlot collect_type_feedback_slot = stmt->TypeProfileSlot();
+    builder()->CollectTypeProfile(stmt->position(),
+                                  feedback_index(collect_type_feedback_slot));
+  }
+
   if (stmt->is_async_return()) {
     execution_control()->AsyncReturnAccumulator();
   } else {
     execution_control()->ReturnAccumulator();
   }
 }
 
 void BytecodeGenerator::VisitWithStatement(WithStatement* stmt) {
   builder()->SetStatementPosition(stmt);
   VisitForAccumulatorValue(stmt->expression());
@@ skipping 1098 matching lines @@
   DCHECK(expr->target()->IsValidReferenceExpressionOrThis());
   Register object, key;
   RegisterList super_property_args;
   const AstRawString* name;
 
   // Left-hand side can only be a property, a global or a variable slot.
   Property* property = expr->target()->AsProperty();
   LhsKind assign_type = Property::GetAssignType(property);
 
   // Evaluate LHS expression.
-  Register lhs_name;
-  if (expr->HasTypeProfileSlot()) {
-    lhs_name = register_allocator()->NewRegister();
-  }
-
   switch (assign_type) {
     case VARIABLE:
-      if (expr->HasTypeProfileSlot()) {
-        builder()
-            ->LoadLiteral(expr->target()->AsVariableProxy()->var()->raw_name())
-            .StoreAccumulatorInRegister(lhs_name);
-      }
       // Nothing to do to evaluate variable assignment LHS.
       break;
     case NAMED_PROPERTY: {
       object = VisitForRegisterValue(property->obj());
       name = property->key()->AsLiteral()->AsRawPropertyName();
-      if (expr->HasTypeProfileSlot()) {
-        builder()->LoadLiteral(name).StoreAccumulatorInRegister(lhs_name);
-      }
       break;
     }
     case KEYED_PROPERTY: {
       object = VisitForRegisterValue(property->obj());
       key = VisitForRegisterValue(property->key());
-      if (expr->HasTypeProfileSlot()) {
-        builder()->StoreAccumulatorInRegister(lhs_name);
-      }
       break;
     }
     case NAMED_SUPER_PROPERTY: {
       super_property_args = register_allocator()->NewRegisterList(4);
       SuperPropertyReference* super_property =
           property->obj()->AsSuperPropertyReference();
       VisitForRegisterValue(super_property->this_var(), super_property_args[0]);
       VisitForRegisterValue(super_property->home_object(),
                             super_property_args[1]);
       builder()
           ->LoadLiteral(property->key()->AsLiteral()->AsRawPropertyName())
           .StoreAccumulatorInRegister(super_property_args[2]);
-      if (expr->HasTypeProfileSlot()) {
-        builder()->StoreAccumulatorInRegister(lhs_name);
-      }
       break;
     }
     case KEYED_SUPER_PROPERTY: {
       super_property_args = register_allocator()->NewRegisterList(4);
       SuperPropertyReference* super_property =
           property->obj()->AsSuperPropertyReference();
       VisitForRegisterValue(super_property->this_var(), super_property_args[0]);
       VisitForRegisterValue(super_property->home_object(),
                             super_property_args[1]);
       VisitForRegisterValue(property->key(), super_property_args[2]);
-      if (expr->HasTypeProfileSlot()) {
-        builder()->StoreAccumulatorInRegister(lhs_name);
-      }
-
       break;
     }
   }
 
   // Evaluate the value and potentially handle compound assignments by loading
   // the left-hand side value and performing a binary operation.
   if (expr->is_compound()) {
     Register old_value = register_allocator()->NewRegister();
     switch (assign_type) {
       case VARIABLE: {
@@ skipping 70 matching lines @@
     }
     case KEYED_SUPER_PROPERTY: {
       builder()
           ->StoreAccumulatorInRegister(super_property_args[3])
           .CallRuntime(StoreKeyedToSuperRuntimeId(), super_property_args);
       break;
     }
   }
 
   // Value is in accumulator.
-  if (expr->HasTypeProfileSlot()) {
+  // TODO(franzih): Collect type profile once we can handle more than just
+  // return statements.
+  if (false && expr->HasTypeProfileSlot()) {
     FeedbackSlot collect_type_feedback_slot = expr->TypeProfileSlot();
 
-    builder()->CollectTypeProfile(lhs_name,
+    builder()->CollectTypeProfile(expr->position(),
                                   feedback_index(collect_type_feedback_slot));
   }
 }
 
 void BytecodeGenerator::VisitYield(Yield* expr) {
   builder()->SetExpressionPosition(expr);
   Register value = VisitForRegisterValue(expr->expression());
 
   Register generator = VisitForRegisterValue(expr->generator_object());
 
@@ skipping 1144 matching lines @@
 }
 
 Runtime::FunctionId BytecodeGenerator::StoreKeyedToSuperRuntimeId() {
   return is_strict(language_mode()) ? Runtime::kStoreKeyedToSuper_Strict
                                     : Runtime::kStoreKeyedToSuper_Sloppy;
 }
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8