[proxy] fixing harmony/proxy.js tests and improving error messages + some drive-by fixes

src/ia32/code-stubs-ia32.cc

 // Copyright 2012 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.
 
 #if V8_TARGET_ARCH_IA32
 
 #include "src/base/bits.h"
 #include "src/bootstrapper.h"
 #include "src/code-stubs.h"
 #include "src/codegen.h"
@@ skipping 2546 matching lines @@
   __ bind(&function_prototype_valid);
   __ AssertNotSmi(function_prototype);
 
   // Update the global instanceof cache with the current {object} map and
   // {function}.  The cached answer will be set when it is known below.
   __ StoreRoot(function, scratch, Heap::kInstanceofCacheFunctionRootIndex);
   __ StoreRoot(object_map, scratch, Heap::kInstanceofCacheMapRootIndex);
 
   // Loop through the prototype chain looking for the {function} prototype.
   // Assume true, and change to false if not found.
-  Label done, loop, proxy_case;
+  Label done, loop, proxy_case, global_object_case;
   __ mov(eax, isolate()->factory()->true_value());
   __ bind(&loop);
+  __ CmpInstanceType(object_map, JS_GLOBAL_OBJECT_TYPE);
+  __ j(equal, &global_object_case);
+  __ CmpInstanceType(object_map, JS_GLOBAL_PROXY_TYPE);
+  __ j(equal, &global_object_case);
   __ CmpInstanceType(object_map, JS_PROXY_TYPE);
   __ j(equal, &proxy_case, Label::kNear);
   __ mov(object, FieldOperand(object_map, Map::kPrototypeOffset));
   __ cmp(object, function_prototype);
   __ j(equal, &done, Label::kNear);
+  __ mov(object_map, FieldOperand(object, HeapObject::kMapOffset));
   __ cmp(object, isolate()->factory()->null_value());
-  __ mov(object_map, FieldOperand(object, HeapObject::kMapOffset));
   __ j(not_equal, &loop);
   __ mov(eax, isolate()->factory()->false_value());
+
   __ bind(&done);
   __ StoreRoot(eax, scratch, Heap::kInstanceofCacheAnswerRootIndex);
   __ ret(0);
 
+  // Global object needs access checks, jump to the runtime.
+  __ bind(&global_object_case);
+  __ PopReturnAddressTo(scratch);
+  __ Push(object);
+  __ Push(function_prototype);
+  __ PushReturnAddressFrom(scratch);
+  // Invalidate the instanceof cache.
+  __ Move(eax, Immediate(Smi::FromInt(0)));
+  __ StoreRoot(eax, scratch, Heap::kInstanceofCacheFunctionRootIndex);
+  __ TailCallRuntime(Runtime::kHasInPrototypeChain, 2, 1);
+
   // Proxy-case: Call the %HasInPrototypeChain runtime function.
   __ bind(&proxy_case);
   __ PopReturnAddressTo(scratch);
   __ Push(object);
   __ Push(function_prototype);
   __ PushReturnAddressFrom(scratch);
   // Invalidate the instanceof cache.
   __ Move(eax, Immediate(Smi::FromInt(0)));
   __ StoreRoot(eax, scratch, Heap::kInstanceofCacheFunctionRootIndex);
   __ TailCallRuntime(Runtime::kHasInPrototypeChain, 2, 1);
@@ skipping 3047 matching lines @@
                            Operand(ebp, 7 * kPointerSize), NULL);
 }
 
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32