diff options
| author | Ben Murdoch <benm@google.com> | 2012-05-21 14:31:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-21 14:31:26 -0700 |
| commit | 067f904298c3c63313c6b5c8659c7daa5264714f (patch) | |
| tree | 8292205315f0445a476d55e85ef077f494ff7efd /src/arm/stub-cache-arm.cc | |
| parent | a52989282d6fb5ddd8b3a0aa23eff80ac25db913 (diff) | |
| parent | 7523901fd9f17e9755b1e4e37201edade0dc24f6 (diff) | |
| download | android_external_v8-067f904298c3c63313c6b5c8659c7daa5264714f.tar.gz android_external_v8-067f904298c3c63313c6b5c8659c7daa5264714f.tar.bz2 android_external_v8-067f904298c3c63313c6b5c8659c7daa5264714f.zip | |
am 7523901f: am 5710ceac: Merge V8 at 3.9.24.28
* commit '7523901fd9f17e9755b1e4e37201edade0dc24f6':
Merge V8 at 3.9.24.28
Diffstat (limited to 'src/arm/stub-cache-arm.cc')
| -rw-r--r-- | src/arm/stub-cache-arm.cc | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc index 98a3cdcb..d514b607 100644 --- a/src/arm/stub-cache-arm.cc +++ b/src/arm/stub-cache-arm.cc @@ -1266,12 +1266,19 @@ void StubCompiler::GenerateLoadInterceptor(Handle<JSObject> object, name, miss); ASSERT(holder_reg.is(receiver) || holder_reg.is(scratch1)); + // Preserve the receiver register explicitly whenever it is different from + // the holder and it is needed should the interceptor return without any + // result. The CALLBACKS case needs the receiver to be passed into C++ code, + // the FIELD case might cause a miss during the prototype check. + bool must_perfrom_prototype_check = *interceptor_holder != lookup->holder(); + bool must_preserve_receiver_reg = !receiver.is(holder_reg) && + (lookup->type() == CALLBACKS || must_perfrom_prototype_check); + // Save necessary data before invoking an interceptor. // Requires a frame to make GC aware of pushed pointers. { FrameScope frame_scope(masm(), StackFrame::INTERNAL); - if (lookup->type() == CALLBACKS && !receiver.is(holder_reg)) { - // CALLBACKS case needs a receiver to be passed into C++ callback. + if (must_preserve_receiver_reg) { __ Push(receiver, holder_reg, name_reg); } else { __ Push(holder_reg, name_reg); @@ -1296,14 +1303,14 @@ void StubCompiler::GenerateLoadInterceptor(Handle<JSObject> object, __ bind(&interceptor_failed); __ pop(name_reg); __ pop(holder_reg); - if (lookup->type() == CALLBACKS && !receiver.is(holder_reg)) { + if (must_preserve_receiver_reg) { __ pop(receiver); } // Leave the internal frame. } // Check that the maps from interceptor's holder to lookup's holder // haven't changed. And load lookup's holder into |holder| register. - if (*interceptor_holder != lookup->holder()) { + if (must_perfrom_prototype_check) { holder_reg = CheckPrototypes(interceptor_holder, holder_reg, Handle<JSObject>(lookup->holder()), |