[type-profile] Handle returns correctly.

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 1074 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 911 matching lines @@
 }
 
 void BytecodeGenerator::BuildReturn() {
   if (FLAG_trace) {
     RegisterAllocationScope register_scope(this);
     Register result = register_allocator()->NewRegister();
     // Runtime returns {result} value, preserving accumulator.
     builder()->StoreAccumulatorInRegister(result).CallRuntime(
         Runtime::kTraceExit, result);
   }
+  if (!info()->literal()->TypeProfileSlot().IsInvalid()) {
+    builder()->CollectTypeProfile(
+        info()->literal()->position(),
+        feedback_index(info()->literal()->TypeProfileSlot()));
+  }
   builder()->Return();
 }
 
 void BytecodeGenerator::BuildAsyncReturn() {
   DCHECK(IsAsyncFunction(info()->literal()->kind()));
   RegisterAllocationScope register_scope(this);
   RegisterList args = register_allocator()->NewRegisterList(3);
   Register receiver = args[0];
   Register promise = args[1];
   Register return_value = args[2];
@@ skipping 289 matching lines @@
           .CallRuntime(StoreToSuperRuntimeId(), super_property_args);
       break;
     }
     case KEYED_SUPER_PROPERTY: {
       builder()
           ->StoreAccumulatorInRegister(super_property_args[3])
           .CallRuntime(StoreKeyedToSuperRuntimeId(), super_property_args);
       break;
     }
   }
-
-  // Value is in accumulator.
-  // 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(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());
 
   // Save context, registers, and state. Then return.
   builder()
@@ skipping 1142 matching lines @@
 }
 
 Runtime::FunctionId BytecodeGenerator::StoreKeyedToSuperRuntimeId() {
   return is_strict(language_mode()) ? Runtime::kStoreKeyedToSuper_Strict
                                     : Runtime::kStoreKeyedToSuper_Sloppy;
 }
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8