src/arm/stub-cache-arm.cc - Issue 110573004: Merge bleeding_edge 17696:18016.

Unified Diff: src/arm/stub-cache-arm.cc

Issue 110573004: Merge bleeding_edge 17696:18016. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/parser

Patch Set: Created 7 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

Index: src/arm/stub-cache-arm.cc

diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc

index a7ddc8e5326c57aec534ee51d64b8d26d60fd111..7e82fd016758d494e11e0024a792ca57487660ff 100644

--- a/src/arm/stub-cache-arm.cc

+++ b/src/arm/stub-cache-arm.cc

@@ -1298,34 +1298,33 @@ Register StubCompiler::CheckPrototypes(Handle<JSObject> object,

}

-void LoadStubCompiler::HandlerFrontendFooter(Handle<Name> name,

- Label* success,

- Label* miss) {

+void LoadStubCompiler::HandlerFrontendFooter(Handle<Name> name, Label* miss) {

if (!miss->is_unused()) {

- __ b(success);

+ Label success;

+ __ b(&success);

__ bind(miss);

TailCallBuiltin(masm(), MissBuiltin(kind()));

+ __ bind(&success);

}

-void StoreStubCompiler::HandlerFrontendFooter(Handle<Name> name,

- Label* success,

- Label* miss) {

+void StoreStubCompiler::HandlerFrontendFooter(Handle<Name> name, Label* miss) {

if (!miss->is_unused()) {

- __ b(success);

+ Label success;

+ __ b(&success);

GenerateRestoreName(masm(), miss, name);

TailCallBuiltin(masm(), MissBuiltin(kind()));

+ __ bind(&success);

}

- Handle<JSObject> object,

+ Handle<Object> object,

Handle<JSObject> holder,

Handle<Name> name,

- Label* success,

Handle<Object> callback) {

Label miss;

@@ -1362,7 +1361,7 @@ Register LoadStubCompiler::CallbackHandlerFrontend(

__ b(ne, &miss);

}

- HandlerFrontendFooter(name, success, &miss);

+ HandlerFrontendFooter(name, &miss);

return reg;

}

@@ -1468,7 +1467,7 @@ void LoadStubCompiler::GenerateLoadCallback(

void LoadStubCompiler::GenerateLoadInterceptor(

- Handle<JSObject> object,

+ Handle<Object> object,

Handle<JSObject> interceptor_holder,

LookupResult* lookup,

Handle<Name> name) {

@@ -1651,7 +1650,7 @@ Handle<Code> CallStubCompiler::CompileCallField(Handle<JSObject> object,

GenerateMissBranch();

// Return the generated code.

- return GetCode(Code::FIELD, name);

+ return GetCode(Code::FAST, name);

}

@@ -1686,7 +1685,7 @@ Handle<Code> CallStubCompiler::CompileArrayCodeCall(

}

Handle<AllocationSite> site = isolate()->factory()->NewAllocationSite();

- site->set_transition_info(Smi::FromInt(GetInitialFastElementsKind()));

+ site->SetElementsKind(GetInitialFastElementsKind());

Handle<Cell> site_feedback_cell = isolate()->factory()->NewCell(site);

__ mov(r0, Operand(argc));

__ mov(r2, Operand(site_feedback_cell));

@@ -1718,8 +1717,12 @@ Handle<Code> CallStubCompiler::CompileArrayPushCall(

// -- sp[argc * 4] : receiver

// -----------------------------------

- // If object is not an array, bail out to regular call.

- if (!object->IsJSArray() || !cell.is_null()) return Handle<Code>::null();

+ // If object is not an array or is observed, bail out to regular call.

+ if (!object->IsJSArray() ||

+ !cell.is_null() ||

+ Handle<JSArray>::cast(object)->map()->is_observed()) {

+ return Handle<Code>::null();

+ }

Label miss;

GenerateNameCheck(name, &miss);

@@ -1972,8 +1975,12 @@ Handle<Code> CallStubCompiler::CompileArrayPopCall(

// -- sp[argc * 4] : receiver

// -----------------------------------

- // If object is not an array, bail out to regular call.

- if (!object->IsJSArray() || !cell.is_null()) return Handle<Code>::null();

+ // If object is not an array or is observed, bail out to regular call.

+ if (!object->IsJSArray() ||

+ !cell.is_null() ||

+ Handle<JSArray>::cast(object)->map()->is_observed()) {

+ return Handle<Code>::null();

+ }

Label miss, return_undefined, call_builtin;

@@ -2539,11 +2546,23 @@ Handle<Code> CallStubCompiler::CompileFastApiCall(

}

+void StubCompiler::GenerateBooleanCheck(Register object, Label* miss) {

+ Label success;

+ // Check that the object is a boolean.

+ __ LoadRoot(ip, Heap::kTrueValueRootIndex);

+ __ cmp(object, ip);

+ __ b(eq, &success);

+ __ LoadRoot(ip, Heap::kFalseValueRootIndex);

+ __ cmp(object, ip);

+ __ b(ne, miss);

+ __ bind(&success);

void CallStubCompiler::CompileHandlerFrontend(Handle<Object> object,

Handle<JSObject> holder,

Handle<Name> name,

- CheckType check,

- Label* success) {

+ CheckType check) {

// ----------- S t a t e -------------

// -- r2 : name

// -- lr : return address

@@ -2619,15 +2638,8 @@ void CallStubCompiler::CompileHandlerFrontend(Handle<Object> object,

break;

}

case BOOLEAN_CHECK: {

- Label fast;

- // Check that the object is a boolean.

- __ LoadRoot(ip, Heap::kTrueValueRootIndex);

- __ cmp(r1, ip);

- __ b(eq, &fast);

- __ LoadRoot(ip, Heap::kFalseValueRootIndex);

- __ cmp(r1, ip);

- __ b(ne, &miss);

- __ bind(&fast);

+ GenerateBooleanCheck(r1, &miss);

// Check that the maps starting from the prototype haven't changed.

GenerateDirectLoadGlobalFunctionPrototype(

masm(), Context::BOOLEAN_FUNCTION_INDEX, r0, &miss);

@@ -2638,11 +2650,14 @@ void CallStubCompiler::CompileHandlerFrontend(Handle<Object> object,

}

- __ b(success);

+ Label success;

+ __ b(&success);

// Handle call cache miss.

__ bind(&miss);

GenerateMissBranch();

+ __ bind(&success);

}

@@ -2666,15 +2681,12 @@ Handle<Code> CallStubCompiler::CompileCallConstant(

Handle<Code> code = CompileCustomCall(object, holder,

Handle<Cell>::null(),

function, Handle<String>::cast(name),

- Code::CONSTANT);

+ Code::FAST);

// A null handle means bail out to the regular compiler code below.

if (!code.is_null()) return code;

}

- Label success;

- CompileHandlerFrontend(object, holder, name, check, &success);

- __ bind(&success);

+ CompileHandlerFrontend(object, holder, name, check);

CompileHandlerBackend(function);

// Return the generated code.

@@ -2716,7 +2728,7 @@ Handle<Code> CallStubCompiler::CompileCallInterceptor(Handle<JSObject> object,

GenerateMissBranch();

// Return the generated code.

- return GetCode(Code::INTERCEPTOR, name);

+ return GetCode(Code::FAST, name);

}

@@ -2785,9 +2797,7 @@ Handle<Code> StoreStubCompiler::CompileStoreCallback(

Handle<JSObject> holder,

Handle<Name> name,

Handle<ExecutableAccessorInfo> callback) {

- Label success;

- HandlerFrontend(object, receiver(), holder, name, &success);

- __ bind(&success);

+ HandlerFrontend(object, receiver(), holder, name);

// Stub never generated for non-global objects that require access checks.

ASSERT(holder->IsJSGlobalProxy() || !holder->IsAccessCheckNeeded());

@@ -2804,7 +2814,7 @@ Handle<Code> StoreStubCompiler::CompileStoreCallback(

__ TailCallExternalReference(store_callback_property, 4, 1);

// Return the generated code.

- return GetCode(kind(), Code::CALLBACKS, name);

+ return GetCode(kind(), Code::FAST, name);

}

@@ -2813,16 +2823,14 @@ Handle<Code> StoreStubCompiler::CompileStoreCallback(

Handle<JSObject> holder,

Handle<Name> name,

const CallOptimization& call_optimization) {

- Label success;

- HandlerFrontend(object, receiver(), holder, name, &success);

- __ bind(&success);

+ HandlerFrontend(object, receiver(), holder, name);

GenerateFastApiCall(

masm(), call_optimization, receiver(), scratch3(), 1, values);

// Return the generated code.

- return GetCode(kind(), Code::CALLBACKS, name);

+ return GetCode(kind(), Code::FAST, name);

}

@@ -2905,27 +2913,24 @@ Handle<Code> StoreStubCompiler::CompileStoreInterceptor(

TailCallBuiltin(masm(), MissBuiltin(kind()));

// Return the generated code.

- return GetCode(kind(), Code::INTERCEPTOR, name);

+ return GetCode(kind(), Code::FAST, name);

}

Handle<Code> LoadStubCompiler::CompileLoadNonexistent(

- Handle<JSObject> object,

+ Handle<Object> object,

Handle<JSObject> last,

Handle<Name> name,

Handle<JSGlobalObject> global) {

- Label success;

+ NonexistentHandlerFrontend(object, last, name, global);

- NonexistentHandlerFrontend(object, last, name, &success, global);

- __ bind(&success);

// Return undefined if maps of the full prototype chain are still the

// same and no global property with this name contains a value.

__ LoadRoot(r0, Heap::kUndefinedValueRootIndex);

__ Ret();

// Return the generated code.

- return GetCode(kind(), Code::NONEXISTENT, name);

+ return GetCode(kind(), Code::FAST, name);

}

@@ -3013,12 +3018,12 @@ void LoadStubCompiler::GenerateLoadViaGetter(MacroAssembler* masm,

Handle<Code> LoadStubCompiler::CompileLoadGlobal(

- Handle<JSObject> object,

+ Handle<Object> object,

Handle<GlobalObject> global,

Handle<PropertyCell> cell,

Handle<Name> name,

bool is_dont_delete) {

- Label success, miss;

+ Label miss;

HandlerFrontendHeader(object, receiver(), global, name, &miss);

@@ -3033,8 +3038,7 @@ Handle<Code> LoadStubCompiler::CompileLoadGlobal(

__ b(eq, &miss);

}

- HandlerFrontendFooter(name, &success, &miss);

- __ bind(&success);

+ HandlerFrontendFooter(name, &miss);

Counters* counters = isolate()->counters();

__ IncrementCounter(counters->named_load_global_stub(), 1, r1, r3);

@@ -3047,7 +3051,7 @@ Handle<Code> LoadStubCompiler::CompileLoadGlobal(

Handle<Code> BaseLoadStoreStubCompiler::CompilePolymorphicIC(

- MapHandleList* receiver_maps,

+ TypeHandleList* types,

CodeHandleList* handlers,

Handle<Name> name,

Code::StubType type,

@@ -3058,18 +3062,26 @@ Handle<Code> BaseLoadStoreStubCompiler::CompilePolymorphicIC(

GenerateNameCheck(name, this->name(), &miss);

}

- __ JumpIfSmi(receiver(), &miss);

+ Label number_case;

+ Label* smi_target = IncludesNumberType(types) ? &number_case : &miss;

+ __ JumpIfSmi(receiver(), smi_target);

- int receiver_count = receiver_maps->length();

+ int receiver_count = types->length();

int number_of_handled_maps = 0;

__ ldr(map_reg, FieldMemOperand(receiver(), HeapObject::kMapOffset));

for (int current = 0; current < receiver_count; ++current) {

- Handle<Map> map = receiver_maps->at(current);

+ Handle<Type> type = types->at(current);

+ Handle<Map> map = IC::TypeToMap(*type, isolate());

if (!map->is_deprecated()) {

number_of_handled_maps++;

- __ mov(ip, Operand(receiver_maps->at(current)));

+ __ mov(ip, Operand(map));

__ cmp(map_reg, ip);

+ if (type->Is(Type::Number())) {

+ ASSERT(!number_case.is_unused());

+ __ bind(&number_case);

+ }

__ Jump(handlers->at(current), RelocInfo::CODE_TARGET, eq);

}

@@ -3128,12 +3140,12 @@ void KeyedLoadStubCompiler::GenerateLoadDictionaryElement(

// -- r0 : key

// -- r1 : receiver

// -----------------------------------

- Label slow, miss_force_generic;

+ Label slow, miss;

- __ UntagAndJumpIfNotSmi(r2, key, &miss_force_generic);

+ __ UntagAndJumpIfNotSmi(r2, key, &miss);

__ ldr(r4, FieldMemOperand(receiver, JSObject::kElementsOffset));

__ LoadFromNumberDictionary(&slow, r4, key, r0, r2, r3, r5);

__ Ret();

@@ -3151,14 +3163,14 @@ void KeyedLoadStubCompiler::GenerateLoadDictionaryElement(

TailCallBuiltin(masm, Builtins::kKeyedLoadIC_Slow);

// Miss case, call the runtime.

- __ bind(&miss_force_generic);

+ __ bind(&miss);

// ---------- S t a t e --------------

// -- lr : return address

// -- r0 : key

// -- r1 : receiver

// -----------------------------------

- TailCallBuiltin(masm, Builtins::kKeyedLoadIC_MissForceGeneric);

+ TailCallBuiltin(masm, Builtins::kKeyedLoadIC_Miss);

}

« include/v8-platform.h ('K') | « src/arm/macro-assembler-arm.cc ('k') | src/assembler.h » ('j') | no next file with comments »