Use is_bootstrapping everywhere

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 2518 matching lines @@
   CHECK_EQ(42 * 5 + 40 * 5,
            context->Global()->Get(v8_str("result"))->Int32Value());
 }
 
 
 static int interceptor_call_count = 0;
 
 static void InterceptorICRefErrorGetter(
     Local<Name> name, const v8::PropertyCallbackInfo<v8::Value>& info) {
   ApiTestFuzzer::Fuzz();
-  if (v8_str("x")->Equals(name) && interceptor_call_count++ < 20) {
+  if (!is_bootstrapping && v8_str("x")->Equals(name) &&
+      interceptor_call_count++ < 20) {
     info.GetReturnValue().Set(call_ic_function2);
   }
 }
 
 
 // This test should hit load and call ICs for the interceptor case.
 // Once in a while, the interceptor will reply that a property was not
 // found in which case we should get a reference error.
 THREADED_TEST(InterceptorICReferenceErrors) {
   v8::Isolate* isolate = CcTest::isolate();
   v8::HandleScope scope(isolate);
   v8::Handle<v8::ObjectTemplate> templ = ObjectTemplate::New(isolate);
   templ->SetHandler(
       v8::NamedPropertyHandlerConfiguration(InterceptorICRefErrorGetter));
-  interceptor_call_count = -100000;  // Generous limit for bootstrapping.
+  is_bootstrapping = true;
   LocalContext context(0, templ, v8::Handle<Value>());
-  interceptor_call_count = 0;
+  is_bootstrapping = false;
   call_ic_function2 = v8_compile("function h(x) { return x; }; h")->Run();
   v8::Handle<Value> value = CompileRun(
       "function f() {"
       "  for (var i = 0; i < 1000; i++) {"
       "    try { x; } catch(e) { return true; }"
       "  }"
       "  return false;"
       "};"
       "f();");
   CHECK_EQ(true, value->BooleanValue());
   interceptor_call_count = 0;
   value = CompileRun(
       "function g() {"
       "  for (var i = 0; i < 1000; i++) {"
       "    try { x(42); } catch(e) { return true; }"
       "  }"
       "  return false;"
       "};"
       "g();");
   CHECK_EQ(true, value->BooleanValue());
 }
 
 
 static int interceptor_ic_exception_get_count = 0;
 
 static void InterceptorICExceptionGetter(
     Local<Name> name, const v8::PropertyCallbackInfo<v8::Value>& info) {
   ApiTestFuzzer::Fuzz();
+  if (is_bootstrapping) return;
   if (v8_str("x")->Equals(name) && ++interceptor_ic_exception_get_count < 20) {
     info.GetReturnValue().Set(call_ic_function3);
   }
   if (interceptor_ic_exception_get_count == 20) {
     info.GetIsolate()->ThrowException(v8_num(42));
     return;
   }
 }
 
 
 // Test interceptor load/call IC where the interceptor throws an
 // exception once in a while.
 THREADED_TEST(InterceptorICGetterExceptions) {
   interceptor_ic_exception_get_count = 0;
   v8::Isolate* isolate = CcTest::isolate();
   v8::HandleScope scope(isolate);
   v8::Handle<v8::ObjectTemplate> templ = ObjectTemplate::New(isolate);
   // Generous limit for bootstrapping.

[Jakob Kummerow, 2015/07/01 16:08:39]

nit: outdated comment

-  interceptor_ic_exception_get_count = -100000;
   templ->SetHandler(
       v8::NamedPropertyHandlerConfiguration(InterceptorICExceptionGetter));
   LocalContext context(0, templ, v8::Handle<Value>());
-  interceptor_ic_exception_get_count = 0;
   call_ic_function3 = v8_compile("function h(x) { return x; }; h")->Run();
   v8::Handle<Value> value = CompileRun(
       "function f() {"
       "  for (var i = 0; i < 100; i++) {"
       "    try { x; } catch(e) { return true; }"
       "  }"
       "  return false;"
       "};"
       "f();");
   CHECK_EQ(true, value->BooleanValue());
@@ skipping 696 matching lines @@
       "var obj = intercepted_1;"
       "obj.x = 4;"
       "eval('obj.x');"
       "eval('obj.x');"
       "eval('obj.x');"
       "obj = intercepted_2;"
       "obj.x = 9;"
       "eval('obj.x');",
       9);
 }