src/a64/stub-cache-a64.cc - Issue 149133004: A64: Synchronize with r17807.

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

Issue 149133004: A64: Synchronize with r17807. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/a64

Patch Set: Created 6 years, 10 months 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/a64/stub-cache-a64.cc

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

index 291db280565a3a9796fb676de6e6e46e3c96743c..5e5201a97be84b8e941db332d7632a66fff3f73f 100644

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

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

@@ -1286,33 +1286,36 @@ 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);

}

-Register LoadStubCompiler::CallbackHandlerFrontend(Handle<JSObject> object,

+Register LoadStubCompiler::CallbackHandlerFrontend(Handle<Object> object,

Handle<JSObject> holder,

Handle<Name> name,

- Label* success,

Handle<Object> callback) {

Label miss;

@@ -1351,7 +1354,7 @@ Register LoadStubCompiler::CallbackHandlerFrontend(Handle<JSObject> object,

__ B(ne, &miss);

}

- HandlerFrontendFooter(name, success, &miss);

+ HandlerFrontendFooter(name, &miss);

return reg;

}

@@ -1491,7 +1494,7 @@ void LoadStubCompiler::GenerateLoadCallback(

void LoadStubCompiler::GenerateLoadInterceptor(

- Handle<JSObject> object,

+ Handle<Object> object,

Handle<JSObject> interceptor_holder,

LookupResult* lookup,

Handle<Name> name) {

@@ -1726,7 +1729,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(x0, argc);

__ Mov(x1, Operand(function));

@@ -1758,8 +1761,12 @@ Handle<Code> CallStubCompiler::CompileArrayPushCall(

// -- sp[argc * 8] : 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;

@@ -2028,8 +2035,12 @@ Handle<Code> CallStubCompiler::CompileArrayPopCall(

// -- sp[argc * 8] : 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();

+ }

const int argc = arguments().immediate();

@@ -2598,11 +2609,20 @@ Handle<Code> CallStubCompiler::CompileFastApiCall(

}

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

+ Label success;

+ // Check that the object is a boolean.

+ // TODO(all): Optimize this like LCodeGen::DoDeferredTaggedToI.

+ __ JumpIfRoot(object, Heap::kTrueValueRootIndex, &success);

+ __ JumpIfNotRoot(object, Heap::kFalseValueRootIndex, 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 -------------

// -- x2 : name

// -- lr : return address

@@ -2681,12 +2701,8 @@ void CallStubCompiler::CompileHandlerFrontend(Handle<Object> object,

break;

}

case BOOLEAN_CHECK: {

- Label fast;

- // Check that the object is a boolean.

- __ JumpIfRoot(receiver, Heap::kTrueValueRootIndex, &fast);

- __ JumpIfNotRoot(receiver, Heap::kFalseValueRootIndex, &miss);

+ GenerateBooleanCheck(receiver, &miss);

- __ Bind(&fast);

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

GenerateDirectLoadGlobalFunctionPrototype(

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

}

- __ B(success);

+ Label success;

+ __ B(&success);

// Handle call cache miss.

__ Bind(&miss);

GenerateMissBranch();

+ __ Bind(&success);

}

@@ -2731,10 +2750,7 @@ Handle<Code> CallStubCompiler::CompileCallConstant(

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.

@@ -2856,10 +2872,7 @@ Handle<Code> StoreStubCompiler::CompileStoreCallback(

Handle<Name> name,

Handle<ExecutableAccessorInfo> callback) {

ASM_LOCATION("StoreStubCompiler::CompileStoreCallback");

- 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());

@@ -2965,14 +2978,12 @@ Handle<Code> StoreStubCompiler::CompileStoreInterceptor(

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, &success, global);

+ NonexistentHandlerFrontend(object, last, name, 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(x0, Heap::kUndefinedValueRootIndex);

@@ -3073,12 +3084,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);

@@ -3091,8 +3102,7 @@ Handle<Code> LoadStubCompiler::CompileLoadGlobal(

__ JumpIfRoot(x4, Heap::kTheHoleValueRootIndex, &miss);

}

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

- __ Bind(&success);

+ HandlerFrontendFooter(name, &miss);

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

__ IncrementCounter(counters->named_load_global_stub(), 1, x1, x3);

@@ -3116,10 +3126,13 @@ Handle<Code> BaseLoadStoreStubCompiler::CompilePolymorphicIC(

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

}

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

+ Label number_case;

+ Label* smi_target = HasHeapNumberMap(receiver_maps) ? &number_case : &miss;

+ __ JumpIfSmi(receiver(), smi_target);

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

+ Handle<Map> heap_number_map = isolate()->factory()->heap_number_map();

int receiver_count = receiver_maps->length();

int number_of_handled_maps = 0;

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

@@ -3129,6 +3142,10 @@ Handle<Code> BaseLoadStoreStubCompiler::CompilePolymorphicIC(

Label try_next;

__ Cmp(map_reg, Operand(receiver_maps->at(current)));

__ B(ne, &try_next);

+ if (map.is_identical_to(heap_number_map)) {

+ ASSERT(!number_case.is_unused());

+ __ Bind(&number_case);

+ }

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

__ Bind(&try_next);

}

@@ -3184,9 +3201,7 @@ 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(

« no previous file with comments | « src/a64/macro-assembler-a64.cc ('k') | src/allocation-tracker.h » ('j') | no next file with comments »