[api] Fix DescriptorInterceptor with access check.

test/cctest/test-api-interceptors.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 <stdlib.h>
 
 #include "test/cctest/test-api.h"
 
 #include "include/v8-util.h"
 #include "src/api.h"
@@ skipping 558 matching lines @@
   CHECK_EQ(44, v8::Script::Compile(ctx, code)
                    .ToLocalChecked()
                    ->Run(ctx)
                    .ToLocalChecked()
                    ->Int32Value(ctx)
                    .FromJust());
   CHECK_EQ(3, set_was_called_counter);
 }
 
 namespace {
+int descriptor_was_called;
+
+void PropertyDescriptorCallback(
+    Local<Name> name, const v8::PropertyCallbackInfo<v8::Value>& info) {
+  // Intercept the callback by setting a different descriptor.
+  descriptor_was_called++;
+  const char* code =
+      "var desc = {value: 5};"
+      "desc;";
+  Local<Value> descriptor = v8_compile(code)
+                                ->Run(info.GetIsolate()->GetCurrentContext())
+                                .ToLocalChecked();
+  info.GetReturnValue().Set(descriptor);
+}
+}  // namespace
+
+// Check that the descriptor callback is called on the global object.
+THREADED_TEST(DescriptorCallbackOnGlobalObject) {
+  v8::HandleScope scope(CcTest::isolate());
+  LocalContext env;
+  v8::Local<v8::FunctionTemplate> templ =
+      v8::FunctionTemplate::New(CcTest::isolate());
+
+  v8::Local<ObjectTemplate> object_template = templ->InstanceTemplate();
+  object_template->SetHandler(v8::NamedPropertyHandlerConfiguration(
+      nullptr, nullptr, PropertyDescriptorCallback, nullptr, nullptr, nullptr));
+  v8::Local<v8::Context> ctx =
+      v8::Context::New(CcTest::isolate(), nullptr, object_template);
+
+  descriptor_was_called = 0;
+
+  // Declare function.
+  v8::Local<v8::String> code = v8_str(
+      "var x = 42; var desc = Object.getOwnPropertyDescriptor(this, 'x'); "
+      "desc.value;");
+  CHECK_EQ(5, v8::Script::Compile(ctx, code)
+                  .ToLocalChecked()
+                  ->Run(ctx)
+                  .ToLocalChecked()
+                  ->Int32Value(ctx)
+                  .FromJust());
+  CHECK_EQ(1, descriptor_was_called);
+}
+
+namespace {
 void QueryCallbackSetDontDelete(
     Local<Name> property, const v8::PropertyCallbackInfo<v8::Integer>& info) {
   info.GetReturnValue().Set(v8::PropertyAttribute::DontDelete);
 }
 
 }  // namespace
 
 // Regression for a Node.js test that fails in debug mode.
 THREADED_TEST(InterceptorFunctionRedeclareWithQueryCallback) {
   v8::HandleScope scope(CcTest::isolate());
@@ skipping 4040 matching lines @@
       .FromJust();
   CompileRun(
       "checked.__proto__ = intercepted_1;"
       "intercepted_1.__proto__ = intercepted_0;");
 
   CHECK_EQ(3, access_check_data.count);
 
   ExpectInt32("checked.whatever", 17);
   CHECK(!CompileRun("Object.getOwnPropertyDescriptor(checked, 'whatever')")
              ->IsUndefined());
-  CHECK_EQ(5, access_check_data.count);
+  CHECK_EQ(6, access_check_data.count);
 
   access_check_data.result = false;
   ExpectInt32("checked.whatever", intercept_data_0.value);
   {
     v8::TryCatch try_catch(isolate);
     CompileRun("Object.getOwnPropertyDescriptor(checked, 'whatever')");
     CHECK(try_catch.HasCaught());
   }
-  CHECK_EQ(7, access_check_data.count);
+  CHECK_EQ(9, access_check_data.count);
 
   intercept_data_1.should_intercept = true;
   ExpectInt32("checked.whatever", intercept_data_1.value);
   {
     v8::TryCatch try_catch(isolate);
     CompileRun("Object.getOwnPropertyDescriptor(checked, 'whatever')");
     CHECK(try_catch.HasCaught());
   }
-  CHECK_EQ(9, access_check_data.count);
+  CHECK_EQ(12, access_check_data.count);
   g_access_check_data = nullptr;
 }
 
 
 TEST(IndexedAllCanReadInterceptor) {
   auto isolate = CcTest::isolate();
   v8::HandleScope handle_scope(isolate);
   LocalContext context;
 
   AccessCheckData access_check_data;
@@ skipping 48 matching lines @@
   CompileRun(
       "checked.__proto__ = intercepted_1;"
       "intercepted_1.__proto__ = intercepted_0;");
 
   CHECK_EQ(3, access_check_data.count);
 
   access_check_data.result = true;
   ExpectInt32("checked[15]", 17);
   CHECK(!CompileRun("Object.getOwnPropertyDescriptor(checked, '15')")
              ->IsUndefined());
-  CHECK_EQ(5, access_check_data.count);
+  CHECK_EQ(6, access_check_data.count);
 
   access_check_data.result = false;
   ExpectInt32("checked[15]", intercept_data_0.value);
   {
     v8::TryCatch try_catch(isolate);
     CompileRun("Object.getOwnPropertyDescriptor(checked, '15')");
     CHECK(try_catch.HasCaught());
   }
-  CHECK_EQ(7, access_check_data.count);
+  CHECK_EQ(9, access_check_data.count);
 
   intercept_data_1.should_intercept = true;
   ExpectInt32("checked[15]", intercept_data_1.value);
   {
     v8::TryCatch try_catch(isolate);
     CompileRun("Object.getOwnPropertyDescriptor(checked, '15')");
     CHECK(try_catch.HasCaught());
   }
-  CHECK_EQ(9, access_check_data.count);
+  CHECK_EQ(12, access_check_data.count);
 
   g_access_check_data = nullptr;
 }
 
 
 THREADED_TEST(NonMaskingInterceptorOwnProperty) {
   auto isolate = CcTest::isolate();
   v8::HandleScope handle_scope(isolate);
   LocalContext context;
 
@@ skipping 215 matching lines @@
             ->Set(env.local(), v8_str("Fun"),
                   fun_templ->GetFunction(env.local()).ToLocalChecked())
             .FromJust());
 
   CompileRun(
       "var f = new Fun();"
       "Number.prototype.__proto__ = f;"
       "var a = 42;"
       "for (var i = 0; i<3; i++) { a.foo; }");
 }