Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Unified Diff: src/arm/code-stubs-arm.cc

Issue 1521953002: [proxies] fix access issue when having proxies on the prototype-chain of global objects. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: ppc code mess Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/arm64/code-stubs-arm64.cc » ('j') | src/prototype.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/arm/code-stubs-arm.cc
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc
index 971e67004e321b3906d9002f31a4e20e49b13762..5732d0b24914286399bc8eb14cef2dd12720511f 100644
--- a/src/arm/code-stubs-arm.cc
+++ b/src/arm/code-stubs-arm.cc
@@ -1381,14 +1381,23 @@ void InstanceOfStub::Generate(MacroAssembler* masm) {
// Loop through the prototype chain looking for the {function} prototype.
// Assume true, and change to false if not found.
Register const object_instance_type = function_map;
+ Register const map_bit_field = function_map;
Register const null = scratch;
Register const result = r0;
- Label done, loop, proxy_case;
+
+ Label done, loop, fast_runtime_fallback;
__ LoadRoot(result, Heap::kTrueValueRootIndex);
__ LoadRoot(null, Heap::kNullValueRootIndex);
__ bind(&loop);
+
+ // Check if the object needs to be access checked.
+ __ ldrb(map_bit_field, FieldMemOperand(object_map, Map::kBitFieldOffset));
+ __ tst(map_bit_field, Operand(1 << Map::kIsAccessCheckNeeded));
+ __ b(ne, &fast_runtime_fallback);
+ // Check if the current object is a Proxy.
__ CompareInstanceType(object_map, object_instance_type, JS_PROXY_TYPE);
- __ b(eq, &proxy_case);
+ __ b(eq, &fast_runtime_fallback);
+
__ ldr(object, FieldMemOperand(object_map, Map::kPrototypeOffset));
__ cmp(object, function_prototype);
__ b(eq, &done);
@@ -1400,8 +1409,8 @@ void InstanceOfStub::Generate(MacroAssembler* masm) {
__ StoreRoot(result, Heap::kInstanceofCacheAnswerRootIndex);
__ Ret();
- // Proxy-case: Call the %HasInPrototypeChain runtime function.
- __ bind(&proxy_case);
+ // Found Proxy or access check needed: Call the runtime
+ __ bind(&fast_runtime_fallback);
__ Push(object, function_prototype);
// Invalidate the instanceof cache.
__ Move(scratch, Smi::FromInt(0));
« no previous file with comments | « no previous file | src/arm64/code-stubs-arm64.cc » ('j') | src/prototype.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698