AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Do not embedd store callback in handler.

Browse Source 
BUG=v8:3629
LOG=N

Review URL: https://codereview.chromium.org/881783003

Cr-Commit-Position: refs/heads/master@{#26360}
This commit is contained in:
ulan 2015-01-30 06:54:43 -08:00 committed by Commit bot
parent da90aabc07
commit a113ce28bf
9 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ic/arm/handler-compiler-arm.cc
View File

@ -678,13 +678,12 @@ void NamedLoadHandlerCompiler::GenerateLoadInterceptor(Register holder_reg) {
Handle<Code> NamedStoreHandlerCompiler::CompileStoreCallback(
Handle<JSObject> object, Handle<Name> name,
Handle<ExecutableAccessorInfo> callback) {
Handle<JSObject> object, Handle<Name> name, int accessor_index) {
Register holder_reg = Frontend(name);
__ push(receiver()); // receiver
__ push(holder_reg);
__ mov(ip, Operand(callback)); // callback info
__ mov(ip, Operand(Smi::FromInt(accessor_index)));
__ push(ip);
__ mov(ip, Operand(name));
__ Push(ip, value());

5
src/ic/arm64/handler-compiler-arm64.cc
View File

@ -742,8 +742,7 @@ void NamedLoadHandlerCompiler::GenerateLoadInterceptor(Register holder_reg) {
Handle<Code> NamedStoreHandlerCompiler::CompileStoreCallback(
Handle<JSObject> object, Handle<Name> name,
Handle<ExecutableAccessorInfo> callback) {
Handle<JSObject> object, Handle<Name> name, int accessor_index) {
ASM_LOCATION("NamedStoreHandlerCompiler::CompileStoreCallback");
Register holder_reg = Frontend(name);
@ -753,7 +752,7 @@ Handle<Code> NamedStoreHandlerCompiler::CompileStoreCallback(
// receiver() and holder_reg can alias.
DCHECK(!AreAliased(receiver(), scratch1(), scratch2(), value()));
DCHECK(!AreAliased(holder_reg, scratch1(), scratch2(), value()));
__ Mov(scratch1(), Operand(callback));
__ Mov(scratch1(), Operand(Smi::FromInt(accessor_index)));
__ Mov(scratch2(), Operand(name));
__ Push(receiver(), holder_reg, scratch1(), scratch2(), value());

2
src/ic/handler-compiler.h
View File

@ -225,7 +225,7 @@ class NamedStoreHandlerCompiler : public PropertyHandlerCompiler {
Handle<Name> name);
Handle<Code> CompileStoreField(LookupIterator* it);
Handle<Code> CompileStoreCallback(Handle<JSObject> object, Handle<Name> name,
Handle<ExecutableAccessorInfo> callback);
int accessor_index);
Handle<Code> CompileStoreCallback(Handle<JSObject> object, Handle<Name> name,
const CallOptimization& call_optimization,
int accessor_index);

5
src/ic/ia32/handler-compiler-ia32.cc
View File

@ -695,14 +695,13 @@ void NamedLoadHandlerCompiler::GenerateLoadInterceptor(Register holder_reg) {
Handle<Code> NamedStoreHandlerCompiler::CompileStoreCallback(
Handle<JSObject> object, Handle<Name> name,
Handle<ExecutableAccessorInfo> callback) {
Handle<JSObject> object, Handle<Name> name, int accessor_index) {
Register holder_reg = Frontend(name);
__ pop(scratch1()); // remove the return address
__ push(receiver());
__ push(holder_reg);
__ Push(callback);
__ Push(Smi::FromInt(accessor_index));
__ Push(name);
__ push(value());
__ push(scratch1()); // restore return address

9
src/ic/ic.cc
View File

@ -1720,7 +1720,8 @@ Handle<Code> StoreIC::CompileHandler(LookupIterator* lookup,
break;
}
NamedStoreHandlerCompiler compiler(isolate(), receiver_type(), holder);
return compiler.CompileStoreCallback(receiver, lookup->name(), info);
return compiler.CompileStoreCallback(receiver, lookup->name(),
lookup->GetAccessorIndex());
} else if (accessors->IsAccessorPair()) {
Handle<Object> setter(Handle<AccessorPair>::cast(accessors)->setter(),
isolate());
@ -2808,11 +2809,15 @@ RUNTIME_FUNCTION(ToBooleanIC_Miss) {
RUNTIME_FUNCTION(StoreCallbackProperty) {
Handle<JSObject> receiver = args.at<JSObject>(0);
Handle<JSObject> holder = args.at<JSObject>(1);
Handle<ExecutableAccessorInfo> callback = args.at<ExecutableAccessorInfo>(2);
Handle<Smi> accessor_index = args.at<Smi>(2);
Handle<Name> name = args.at<Name>(3);
Handle<Object> value = args.at<Object>(4);
HandleScope scope(isolate);
Handle<ExecutableAccessorInfo> callback(ExecutableAccessorInfo::cast(
holder->map()->instance_descriptors()->GetCallbacksObject(
accessor_index->value())));
DCHECK(callback->IsCompatibleReceiver(*receiver));
Address setter_address = v8::ToCData<Address>(callback->setter());

5
src/ic/mips/handler-compiler-mips.cc
View File

@ -669,12 +669,11 @@ void NamedLoadHandlerCompiler::GenerateLoadInterceptor(Register holder_reg) {
Handle<Code> NamedStoreHandlerCompiler::CompileStoreCallback(
Handle<JSObject> object, Handle<Name> name,
Handle<ExecutableAccessorInfo> callback) {
Handle<JSObject> object, Handle<Name> name, int accessor_index) {
Register holder_reg = Frontend(name);
__ Push(receiver(), holder_reg); // Receiver.
__ li(at, Operand(callback)); // Callback info.
__ li(at, Operand(Smi::FromInt(accessor_index)));
__ push(at);
__ li(at, Operand(name));
__ Push(at, value());

5
src/ic/mips64/handler-compiler-mips64.cc
View File

@ -670,12 +670,11 @@ void NamedLoadHandlerCompiler::GenerateLoadInterceptor(Register holder_reg) {
Handle<Code> NamedStoreHandlerCompiler::CompileStoreCallback(
Handle<JSObject> object, Handle<Name> name,
Handle<ExecutableAccessorInfo> callback) {
Handle<JSObject> object, Handle<Name> name, int accessor_index) {
Register holder_reg = Frontend(name);
__ Push(receiver(), holder_reg); // Receiver.
__ li(at, Operand(callback)); // Callback info.
__ li(at, Operand(Smi::FromInt(accessor_index)));
__ push(at);
__ li(at, Operand(name));
__ Push(at, value());

5
src/ic/x64/handler-compiler-x64.cc
View File

@ -682,14 +682,13 @@ void NamedLoadHandlerCompiler::GenerateLoadInterceptor(Register holder_reg) {
Handle<Code> NamedStoreHandlerCompiler::CompileStoreCallback(
Handle<JSObject> object, Handle<Name> name,
Handle<ExecutableAccessorInfo> callback) {
Handle<JSObject> object, Handle<Name> name, int accessor_index) {
Register holder_reg = Frontend(name);
__ PopReturnAddressTo(scratch1());
__ Push(receiver());
__ Push(holder_reg);
__ Push(callback); // callback info
__ Push(Smi::FromInt(accessor_index));
__ Push(name);
__ Push(value());
__ PushReturnAddressFrom(scratch1());

5
src/ic/x87/handler-compiler-x87.cc
View File

@ -696,14 +696,13 @@ void NamedLoadHandlerCompiler::GenerateLoadInterceptor(Register holder_reg) {
Handle<Code> NamedStoreHandlerCompiler::CompileStoreCallback(
Handle<JSObject> object, Handle<Name> name,
Handle<ExecutableAccessorInfo> callback) {
Handle<JSObject> object, Handle<Name> name, int accessor_index) {
Register holder_reg = Frontend(name);
__ pop(scratch1()); // remove the return address
__ push(receiver());
__ push(holder_reg);
__ Push(callback);
__ Push(Smi::FromInt(accessor_index));
__ Push(name);
__ push(value());
__ push(scratch1()); // restore return address