[Interpreter] Always store current context in the frames context slot.

src/interpreter/bytecodes.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/bytecodes.h"
 
 #include "src/frames.h"
 #include "src/interpreter/bytecode-traits.h"
 
 namespace v8 {
@@ skipping 276 matching lines @@
         os << "[" << ReadUnalignedUInt16(operand_start) << "]";
         break;
       case interpreter::OperandType::kImm8:
         os << "#" << static_cast<int>(static_cast<int8_t>(*operand_start));
         break;
       case interpreter::OperandType::kMaybeReg8:
       case interpreter::OperandType::kMaybeReg16:
       case interpreter::OperandType::kReg8:
       case interpreter::OperandType::kReg16: {
         Register reg = DecodeRegister(operand_start, op_type);
-        if (reg.is_function_context()) {
+        if (reg.is_current_context()) {
           os << "<context>";
         } else if (reg.is_function_closure()) {
           os << "<closure>";
         } else if (reg.is_new_target()) {
           os << "<new.target>";
         } else if (reg.is_parameter()) {
           int parameter_index = reg.ToParameterIndex(parameter_count);
           if (parameter_index == 0) {
             os << "<this>";
           } else {
@@ skipping 43 matching lines @@
 
 std::ostream& operator<<(std::ostream& os, const OperandSize& operand_size) {
   return os << Bytecodes::OperandSizeToString(operand_size);
 }
 
 
 static const int kLastParamRegisterIndex =
     -InterpreterFrameConstants::kLastParamFromRegisterPointer / kPointerSize;
 static const int kFunctionClosureRegisterIndex =
     -InterpreterFrameConstants::kFunctionFromRegisterPointer / kPointerSize;
-static const int kFunctionContextRegisterIndex =
+static const int kCurrentContextRegisterIndex =
     -InterpreterFrameConstants::kContextFromRegisterPointer / kPointerSize;
 static const int kNewTargetRegisterIndex =
     -InterpreterFrameConstants::kNewTargetFromRegisterPointer / kPointerSize;
 
 
 // Registers occupy range 0-127 in 8-bit value leaving 128 unused values.
 // Parameter indices are biased with the negative value kLastParamRegisterIndex
 // for ease of access in the interpreter.
 static const int kMaxParameterIndex = 128 + kLastParamRegisterIndex;
 
@@ skipping 18 matching lines @@
 Register Register::function_closure() {
   return Register(kFunctionClosureRegisterIndex);
 }
 
 
 bool Register::is_function_closure() const {
   return index() == kFunctionClosureRegisterIndex;
 }
 
 
-Register Register::function_context() {
-  return Register(kFunctionContextRegisterIndex);
+Register Register::current_context() {
+  return Register(kCurrentContextRegisterIndex);
 }
 
 
-bool Register::is_function_context() const {
-  return index() == kFunctionContextRegisterIndex;
+bool Register::is_current_context() const {
+  return index() == kCurrentContextRegisterIndex;
 }
 
 
 Register Register::new_target() { return Register(kNewTargetRegisterIndex); }
 
 
 bool Register::is_new_target() const {
   return index() == kNewTargetRegisterIndex;
 }
 
@@ skipping 48 matching lines @@
   }
   if (reg5.is_valid() && reg4.index() + 1 != reg5.index()) {
     return false;
   }
   return true;
 }
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8