[Interpreter] Add support for loading from / storing to outer context variables.

test/cctest/interpreter/test-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/v8.h"
 
 #include "src/compiler.h"
 #include "src/interpreter/bytecode-array-iterator.h"
 #include "src/interpreter/bytecode-generator.h"
 #include "src/interpreter/interpreter.h"
@@ skipping 17 matching lines @@
     i::FLAG_ignition_fake_try_catch = true;
     i::FLAG_ignition_filter = StrDup(kFunctionName);
     i::FLAG_always_opt = false;
     i::FLAG_allow_natives_syntax = true;
     CcTest::i_isolate()->interpreter()->Initialize();
   }
 
   Isolate* isolate() { return CcTest::i_isolate(); }
   Factory* factory() { return CcTest::i_isolate()->factory(); }
 
-
   Handle<BytecodeArray> MakeTopLevelBytecode(const char* source) {
     const char* old_ignition_filter = i::FLAG_ignition_filter;
     i::FLAG_ignition_filter = "*";
     Local<v8::Script> script = v8_compile(source);
     i::FLAG_ignition_filter = old_ignition_filter;
     i::Handle<i::JSFunction> js_function = v8::Utils::OpenHandle(*script);
     return handle(js_function->shared()->bytecode_array(), CcTest::i_isolate());
   }
 
-
   Handle<BytecodeArray> MakeBytecode(const char* script,
                                      const char* function_name) {
     CompileRun(script);
     Local<Function> function =
         Local<Function>::Cast(CcTest::global()->Get(v8_str(function_name)));
     i::Handle<i::JSFunction> js_function = v8::Utils::OpenHandle(*function);
     return handle(js_function->shared()->bytecode_array(), CcTest::i_isolate());
   }
 
-
   Handle<BytecodeArray> MakeBytecodeForFunctionBody(const char* body) {
     ScopedVector<char> program(1024);
     SNPrintF(program, "function %s() { %s }\n%s();", kFunctionName, body,
              kFunctionName);
     return MakeBytecode(program.start(), kFunctionName);
   }
 
   Handle<BytecodeArray> MakeBytecodeForFunction(const char* function) {
     ScopedVector<char> program(1024);
     SNPrintF(program, "%s\n%s();", function, kFunctionName);
     return MakeBytecode(program.start(), kFunctionName);
   }
+
+  Handle<BytecodeArray> MakeBytecodeForFunctionNoFilter(const char* function) {
+    const char* old_ignition_filter = i::FLAG_ignition_filter;
+    i::FLAG_ignition_filter = "*";
+    ScopedVector<char> program(1024);
+    SNPrintF(program, "%s\n%s();", function, kFunctionName);
+    Handle<BytecodeArray> return_val =
+        MakeBytecode(program.start(), kFunctionName);
+    i::FLAG_ignition_filter = old_ignition_filter;
+    return return_val;
+  }
 };
 
 
 // Helper macros for handcrafting bytecode sequences.
 #define B(x) static_cast<uint8_t>(Bytecode::k##x)
 #define U8(x) static_cast<uint8_t>((x) & 0xff)
 #define R(x) static_cast<uint8_t>(-(x) & 0xff)
 #define A(x, n) R(helper.kLastParamIndex - (n) + 1 + (x))
 #define THIS(n) A(0, n)
 #if defined(V8_TARGET_LITTLE_ENDIAN)
@@ skipping 2820 matching lines @@
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     Handle<BytecodeArray> bytecode_array =
         helper.MakeBytecodeForFunction(snippets[i].code_snippet);
     CheckBytecodeArrayEqual(snippets[i], bytecode_array);
   }
 }
 
 
+TEST(OuterContextVariables) {
+  InitializedHandleScope handle_scope;
+  BytecodeGeneratorHelper helper;
+
+  int context = Register::function_context().index();
+  int first_context_slot = Context::MIN_CONTEXT_SLOTS;
+
+  ExpectedSnippet<InstanceType> snippets[] = {
+      {"function Outer() {"
+       "  var outerVar = 1;"
+       "  function Inner(innerArg) {"
+       "    this.innerFunc = function() { return outerVar * innerArg; }"
+       "  }"
+       "  this.getInnerFunc = function() { return new Inner(1).innerFunc; }"
+       "}"
+       "var f = new Outer().getInnerFunc();",
+       2 * kPointerSize,
+       1,
+       20,
+       {
+           B(Ldar), R(context),                                    //
+           B(Star), R(0),                                          //
+           B(LdaContextSlot), R(0), U8(Context::PREVIOUS_INDEX),   //
+           B(Star), R(0),                                          //
+           B(LdaContextSlot), R(0), U8(first_context_slot),        //
+           B(Star), R(1),                                          //
+           B(LdaContextSlot), R(context), U8(first_context_slot),  //
+           B(Mul), R(1),                                           //
+           B(Return),                                              //
+       }},
+      {"function Outer() {"
+       "  var outerVar = 1;"
+       "  function Inner(innerArg) {"
+       "    this.innerFunc = function() { outerVar = innerArg; }"
+       "  }"
+       "  this.getInnerFunc = function() { return new Inner(1).innerFunc; }"
+       "}"
+       "var f = new Outer().getInnerFunc();",
+       2 * kPointerSize,
+       1,
+       21,
+       {
+           B(LdaContextSlot), R(context), U8(first_context_slot),  //
+           B(Star), R(0),                                          //
+           B(Ldar), R(context),                                    //
+           B(Star), R(1),                                          //
+           B(LdaContextSlot), R(1), U8(Context::PREVIOUS_INDEX),   //
+           B(Star), R(1),                                          //
+           B(Ldar), R(0),                                          //
+           B(StaContextSlot), R(1), U8(first_context_slot),        //
+           B(LdaUndefined),                                        //
+           B(Return),                                              //
+       }},
+  };
+
+  for (size_t i = 0; i < arraysize(snippets); i++) {
+    Handle<BytecodeArray> bytecode_array =
+        helper.MakeBytecodeForFunctionNoFilter(snippets[i].code_snippet);
+    CheckBytecodeArrayEqual(snippets[i], bytecode_array);
+  }
+}
+
+
 TEST(CountOperators) {
   InitializedHandleScope handle_scope;
   BytecodeGeneratorHelper helper;
   Zone zone;
 
   FeedbackVectorSpec feedback_spec(&zone);
   FeedbackVectorSlot slot1 = feedback_spec.AddLoadICSlot();
   FeedbackVectorSlot slot2 = feedback_spec.AddStoreICSlot();
 
   Handle<i::TypeFeedbackVector> vector =
@@ skipping 613 matching lines @@
   for (size_t i = 0; i < arraysize(snippets); i++) {
     Handle<BytecodeArray> bytecode_array =
         helper.MakeBytecodeForFunctionBody(snippets[i].code_snippet);
     CheckBytecodeArrayEqual(snippets[i], bytecode_array);
   }
 }
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8