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

Unified Diff: src/mips/stub-cache-mips.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/mips/stub-cache-mips.cc

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

index 27be2d45147836c34c4ad0b2d96fe89665d6f8dc..9b31b4d7c8865421cf28b75eddf1e09b3f288fa1 100644

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

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

@@ -1287,34 +1287,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()) {

- __ Branch(success);

+ Label success;

+ __ Branch(&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;

+ __ Branch(&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;

@@ -1350,7 +1349,7 @@ Register LoadStubCompiler::CallbackHandlerFrontend(

__ Branch(&miss, ne, scratch2(), Operand(callback));

}

- HandlerFrontendFooter(name, success, &miss);

+ HandlerFrontendFooter(name, &miss);

return reg;

}

@@ -1460,7 +1459,7 @@ void LoadStubCompiler::GenerateLoadCallback(

void LoadStubCompiler::GenerateLoadInterceptor(

- Handle<JSObject> object,

+ Handle<Object> object,

Handle<JSObject> interceptor_holder,

LookupResult* lookup,

Handle<Name> name) {

@@ -1638,7 +1637,7 @@ Handle<Code> CallStubCompiler::CompileCallField(Handle<JSObject> object,

GenerateMissBranch();

// Return the generated code.

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

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

}

@@ -1673,7 +1672,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);

__ li(a0, Operand(argc));

__ li(a2, Operand(site_feedback_cell));

@@ -1705,8 +1704,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;

@@ -1960,8 +1963,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;

@@ -2309,7 +2316,7 @@ Handle<Code> CallStubCompiler::CompileMathFloorCall(

// If the argument is a smi, just return.

STATIC_ASSERT(kSmiTag == 0);

- __ And(t0, v0, Operand(kSmiTagMask));

+ __ SmiTst(v0, t0);

__ DropAndRet(argc + 1, eq, t0, Operand(zero_reg));

__ CheckMap(v0, a1, Heap::kHeapNumberMapRootIndex, &slow, DONT_DO_SMI_CHECK);

@@ -2550,11 +2557,21 @@ Handle<Code> CallStubCompiler::CompileFastApiCall(

}

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

+ Label success;

+ // Check that the object is a boolean.

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

+ __ Branch(&success, eq, object, Operand(at));

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

+ __ Branch(miss, ne, object, Operand(at));

+ __ 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 -------------

// -- a2 : name

// -- ra : return address

@@ -2630,13 +2647,8 @@ void CallStubCompiler::CompileHandlerFrontend(Handle<Object> object,

break;

}

case BOOLEAN_CHECK: {

- Label fast;

- // Check that the object is a boolean.

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

- __ Branch(&fast, eq, a1, Operand(t0));

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

- __ Branch(&miss, ne, a1, Operand(t0));

- __ bind(&fast);

+ GenerateBooleanCheck(a1, &miss);

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

GenerateDirectLoadGlobalFunctionPrototype(

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

@@ -2647,12 +2659,15 @@ void CallStubCompiler::CompileHandlerFrontend(Handle<Object> object,

}

- __ jmp(success);

+ Label success;

+ __ Branch(&success);

// Handle call cache miss.

__ bind(&miss);

GenerateMissBranch();

+ __ bind(&success);

}

@@ -2676,15 +2691,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.

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

GenerateMissBranch();

// Return the generated code.

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

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

}

@@ -2798,9 +2810,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.

@@ -2818,7 +2828,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);

}

@@ -2827,16 +2837,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);

}

@@ -2920,26 +2928,23 @@ 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 is still the same.

__ LoadRoot(v0, Heap::kUndefinedValueRootIndex);

__ Ret();

// Return the generated code.

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

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

}

@@ -3025,12 +3030,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);

@@ -3044,8 +3049,7 @@ Handle<Code> LoadStubCompiler::CompileLoadGlobal(

__ Branch(&miss, eq, t0, Operand(at));

}

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

- __ bind(&success);

+ HandlerFrontendFooter(name, &miss);

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

__ IncrementCounter(counters->named_load_global_stub(), 1, a1, a3);

@@ -3058,7 +3062,7 @@ Handle<Code> LoadStubCompiler::CompileLoadGlobal(

Handle<Code> BaseLoadStoreStubCompiler::CompilePolymorphicIC(

- MapHandleList* receiver_maps,

+ TypeHandleList* types,

CodeHandleList* handlers,

Handle<Name> name,

Code::StubType type,

@@ -3069,18 +3073,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;

__ lw(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++;

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

+ ASSERT(!number_case.is_unused());

+ __ bind(&number_case);

+ }

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

- eq, map_reg, Operand(receiver_maps->at(current)));

+ eq, map_reg, Operand(map));

}

ASSERT(number_of_handled_maps != 0);

@@ -3137,12 +3149,12 @@ void KeyedLoadStubCompiler::GenerateLoadDictionaryElement(

// -- a0 : key

// -- a1 : receiver

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

- Label slow, miss_force_generic;

+ Label slow, miss;

- __ JumpIfNotSmi(key, &miss_force_generic);

+ __ JumpIfNotSmi(key, &miss);

__ lw(t0, FieldMemOperand(receiver, JSObject::kElementsOffset));

__ sra(a2, a0, kSmiTagSize);

__ LoadFromNumberDictionary(&slow, t0, a0, v0, a2, a3, t1);

@@ -3162,14 +3174,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 --------------

// -- ra : return address

// -- a0 : key

// -- a1 : receiver

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

- TailCallBuiltin(masm, Builtins::kKeyedLoadIC_MissForceGeneric);

+ TailCallBuiltin(masm, Builtins::kKeyedLoadIC_Miss);

}

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