| Index: src/stub-cache.cc
|
| ===================================================================
|
| --- src/stub-cache.cc (revision 6955)
|
| +++ src/stub-cache.cc (working copy)
|
| @@ -29,6 +29,7 @@
|
|
|
| #include "api.h"
|
| #include "arguments.h"
|
| +#include "gdb-jit.h"
|
| #include "ic-inl.h"
|
| #include "stub-cache.h"
|
| #include "vm-state-inl.h"
|
| @@ -126,6 +127,7 @@
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| }
|
| PROFILE(CodeCreateEvent(Logger::LOAD_IC_TAG, Code::cast(code), cache_name));
|
| + GDBJIT(AddCode(GDBJITInterface::LOAD_IC, cache_name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| receiver->UpdateMapCodeCache(cache_name, Code::cast(code));
|
| @@ -150,6 +152,7 @@
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| }
|
| PROFILE(CodeCreateEvent(Logger::LOAD_IC_TAG, Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::LOAD_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| receiver->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -175,6 +178,7 @@
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| }
|
| PROFILE(CodeCreateEvent(Logger::LOAD_IC_TAG, Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::LOAD_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| receiver->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -200,6 +204,7 @@
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| }
|
| PROFILE(CodeCreateEvent(Logger::LOAD_IC_TAG, Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::LOAD_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| receiver->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -223,6 +228,7 @@
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| }
|
| PROFILE(CodeCreateEvent(Logger::LOAD_IC_TAG, Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::LOAD_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| receiver->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -256,6 +262,7 @@
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| }
|
| PROFILE(CodeCreateEvent(Logger::LOAD_IC_TAG, Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::LOAD_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| receiver->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -280,6 +287,7 @@
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| }
|
| PROFILE(CodeCreateEvent(Logger::KEYED_LOAD_IC_TAG, Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::KEYED_LOAD_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| receiver->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -305,6 +313,7 @@
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| }
|
| PROFILE(CodeCreateEvent(Logger::KEYED_LOAD_IC_TAG, Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::KEYED_LOAD_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| receiver->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -329,6 +338,7 @@
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| }
|
| PROFILE(CodeCreateEvent(Logger::KEYED_LOAD_IC_TAG, Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::KEYED_LOAD_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| receiver->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -354,6 +364,7 @@
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| }
|
| PROFILE(CodeCreateEvent(Logger::KEYED_LOAD_IC_TAG, Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::KEYED_LOAD_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| receiver->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -377,6 +388,7 @@
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| }
|
| PROFILE(CodeCreateEvent(Logger::KEYED_LOAD_IC_TAG, Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::KEYED_LOAD_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| receiver->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -399,6 +411,7 @@
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| }
|
| PROFILE(CodeCreateEvent(Logger::KEYED_LOAD_IC_TAG, Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::KEYED_LOAD_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result = map->UpdateCodeCache(name, Code::cast(code));
|
| if (!maybe_result->ToObject(&result)) return maybe_result;
|
| @@ -420,6 +433,7 @@
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| }
|
| PROFILE(CodeCreateEvent(Logger::KEYED_LOAD_IC_TAG, Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::KEYED_LOAD_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| receiver->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -465,6 +479,7 @@
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| }
|
| PROFILE(CodeCreateEvent(Logger::STORE_IC_TAG, Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::STORE_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| receiver->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -496,6 +511,74 @@
|
| }
|
|
|
|
|
| +namespace {
|
| +
|
| +ExternalArrayType ElementsKindToExternalArrayType(JSObject::ElementsKind kind) {
|
| + switch (kind) {
|
| + case JSObject::EXTERNAL_BYTE_ELEMENTS:
|
| + return kExternalByteArray;
|
| + case JSObject::EXTERNAL_UNSIGNED_BYTE_ELEMENTS:
|
| + return kExternalUnsignedByteArray;
|
| + case JSObject::EXTERNAL_SHORT_ELEMENTS:
|
| + return kExternalShortArray;
|
| + case JSObject::EXTERNAL_UNSIGNED_SHORT_ELEMENTS:
|
| + return kExternalUnsignedShortArray;
|
| + case JSObject::EXTERNAL_INT_ELEMENTS:
|
| + return kExternalIntArray;
|
| + case JSObject::EXTERNAL_UNSIGNED_INT_ELEMENTS:
|
| + return kExternalUnsignedIntArray;
|
| + case JSObject::EXTERNAL_FLOAT_ELEMENTS:
|
| + return kExternalFloatArray;
|
| + default:
|
| + UNREACHABLE();
|
| + return static_cast<ExternalArrayType>(0);
|
| + }
|
| +}
|
| +
|
| +} // anonymous namespace
|
| +
|
| +
|
| +MaybeObject* StubCache::ComputeKeyedLoadOrStoreExternalArray(
|
| + JSObject* receiver,
|
| + bool is_store) {
|
| + Code::Flags flags =
|
| + Code::ComputeMonomorphicFlags(
|
| + is_store ? Code::KEYED_STORE_IC : Code::KEYED_LOAD_IC,
|
| + NORMAL);
|
| + ExternalArrayType array_type =
|
| + ElementsKindToExternalArrayType(receiver->GetElementsKind());
|
| + String* name =
|
| + is_store ? isolate_->heap()->KeyedStoreExternalArray_symbol()
|
| + : isolate_->heap()->KeyedLoadExternalArray_symbol();
|
| + // Use the global maps for the particular external array types,
|
| + // rather than the receiver's map, when looking up the cached code,
|
| + // so that we actually canonicalize these stubs.
|
| + Map* map = isolate_->heap()->MapForExternalArrayType(array_type);
|
| + Object* code = map->FindInCodeCache(name, flags);
|
| + if (code->IsUndefined()) {
|
| + ExternalArrayStubCompiler compiler;
|
| + { MaybeObject* maybe_code =
|
| + is_store ? compiler.CompileKeyedStoreStub(array_type, flags) :
|
| + compiler.CompileKeyedLoadStub(array_type, flags);
|
| + if (!maybe_code->ToObject(&code)) return maybe_code;
|
| + }
|
| + if (is_store) {
|
| + PROFILE(
|
| + CodeCreateEvent(Logger::KEYED_STORE_IC_TAG, Code::cast(code), 0));
|
| + } else {
|
| + PROFILE(
|
| + CodeCreateEvent(Logger::KEYED_LOAD_IC_TAG, Code::cast(code), 0));
|
| + }
|
| + Object* result;
|
| + { MaybeObject* maybe_result =
|
| + map->UpdateCodeCache(name, Code::cast(code));
|
| + if (!maybe_result->ToObject(&result)) return maybe_result;
|
| + }
|
| + }
|
| + return code;
|
| +}
|
| +
|
| +
|
| MaybeObject* StubCache::ComputeStoreNormal() {
|
| return isolate_->builtins()->builtin(Builtins::StoreIC_Normal);
|
| }
|
| @@ -513,6 +596,7 @@
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| }
|
| PROFILE(CodeCreateEvent(Logger::STORE_IC_TAG, Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::STORE_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| receiver->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -536,6 +620,7 @@
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| }
|
| PROFILE(CodeCreateEvent(Logger::STORE_IC_TAG, Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::STORE_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| receiver->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -558,6 +643,7 @@
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| }
|
| PROFILE(CodeCreateEvent(Logger::STORE_IC_TAG, Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::STORE_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| receiver->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -583,6 +669,7 @@
|
| }
|
| PROFILE(CodeCreateEvent(
|
| Logger::KEYED_STORE_IC_TAG, Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::KEYED_STORE_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| receiver->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -598,6 +685,7 @@
|
| MaybeObject* StubCache::ComputeCallConstant(int argc,
|
| InLoopFlag in_loop,
|
| Code::Kind kind,
|
| + Code::ExtraICState extra_ic_state,
|
| String* name,
|
| Object* object,
|
| JSObject* holder,
|
| @@ -617,12 +705,12 @@
|
| check = BOOLEAN_CHECK;
|
| }
|
|
|
| - Code::Flags flags =
|
| - Code::ComputeMonomorphicFlags(kind,
|
| - CONSTANT_FUNCTION,
|
| - cache_holder,
|
| - in_loop,
|
| - argc);
|
| + Code::Flags flags = Code::ComputeMonomorphicFlags(kind,
|
| + CONSTANT_FUNCTION,
|
| + extra_ic_state,
|
| + cache_holder,
|
| + in_loop,
|
| + argc);
|
| Object* code = map_holder->map()->FindInCodeCache(name, flags);
|
| if (code->IsUndefined()) {
|
| // If the function hasn't been compiled yet, we cannot do it now
|
| @@ -631,7 +719,8 @@
|
| // caches.
|
| if (!function->is_compiled()) return Failure::InternalError();
|
| // Compile the stub - only create stubs for fully compiled functions.
|
| - CallStubCompiler compiler(argc, in_loop, kind, cache_holder);
|
| + CallStubCompiler compiler(
|
| + argc, in_loop, kind, extra_ic_state, cache_holder);
|
| { MaybeObject* maybe_code =
|
| compiler.CompileCallConstant(object, holder, function, name, check);
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| @@ -640,6 +729,7 @@
|
| ASSERT_EQ(flags, Code::cast(code)->flags());
|
| PROFILE(CodeCreateEvent(CALL_LOGGER_TAG(kind, CALL_IC_TAG),
|
| Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::CALL_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| map_holder->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -671,12 +761,14 @@
|
|
|
| Code::Flags flags = Code::ComputeMonomorphicFlags(kind,
|
| FIELD,
|
| + Code::kNoExtraICState,
|
| cache_holder,
|
| in_loop,
|
| argc);
|
| Object* code = map_holder->map()->FindInCodeCache(name, flags);
|
| if (code->IsUndefined()) {
|
| - CallStubCompiler compiler(argc, in_loop, kind, cache_holder);
|
| + CallStubCompiler compiler(
|
| + argc, in_loop, kind, Code::kNoExtraICState, cache_holder);
|
| { MaybeObject* maybe_code =
|
| compiler.CompileCallField(JSObject::cast(object),
|
| holder,
|
| @@ -687,6 +779,7 @@
|
| ASSERT_EQ(flags, Code::cast(code)->flags());
|
| PROFILE(CodeCreateEvent(CALL_LOGGER_TAG(kind, CALL_IC_TAG),
|
| Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::CALL_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| map_holder->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -714,15 +807,16 @@
|
| object = holder;
|
| }
|
|
|
| - Code::Flags flags =
|
| - Code::ComputeMonomorphicFlags(kind,
|
| - INTERCEPTOR,
|
| - cache_holder,
|
| - NOT_IN_LOOP,
|
| - argc);
|
| + Code::Flags flags = Code::ComputeMonomorphicFlags(kind,
|
| + INTERCEPTOR,
|
| + Code::kNoExtraICState,
|
| + cache_holder,
|
| + NOT_IN_LOOP,
|
| + argc);
|
| Object* code = map_holder->map()->FindInCodeCache(name, flags);
|
| if (code->IsUndefined()) {
|
| - CallStubCompiler compiler(argc, NOT_IN_LOOP, kind, cache_holder);
|
| + CallStubCompiler compiler(
|
| + argc, NOT_IN_LOOP, kind, Code::kNoExtraICState, cache_holder);
|
| { MaybeObject* maybe_code =
|
| compiler.CompileCallInterceptor(JSObject::cast(object), holder, name);
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| @@ -730,6 +824,7 @@
|
| ASSERT_EQ(flags, Code::cast(code)->flags());
|
| PROFILE(CodeCreateEvent(CALL_LOGGER_TAG(kind, CALL_IC_TAG),
|
| Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::CALL_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| map_holder->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -764,12 +859,12 @@
|
| InlineCacheHolderFlag cache_holder =
|
| IC::GetCodeCacheForObject(receiver, holder);
|
| JSObject* map_holder = IC::GetCodeCacheHolder(receiver, cache_holder);
|
| - Code::Flags flags =
|
| - Code::ComputeMonomorphicFlags(kind,
|
| - NORMAL,
|
| - cache_holder,
|
| - in_loop,
|
| - argc);
|
| + Code::Flags flags = Code::ComputeMonomorphicFlags(kind,
|
| + NORMAL,
|
| + Code::kNoExtraICState,
|
| + cache_holder,
|
| + in_loop,
|
| + argc);
|
| Object* code = map_holder->map()->FindInCodeCache(name, flags);
|
| if (code->IsUndefined()) {
|
| // If the function hasn't been compiled yet, we cannot do it now
|
| @@ -777,7 +872,8 @@
|
| // internal error which will make sure we do not update any
|
| // caches.
|
| if (!function->is_compiled()) return Failure::InternalError();
|
| - CallStubCompiler compiler(argc, in_loop, kind, cache_holder);
|
| + CallStubCompiler compiler(
|
| + argc, in_loop, kind, Code::kNoExtraICState, cache_holder);
|
| { MaybeObject* maybe_code =
|
| compiler.CompileCallGlobal(receiver, holder, cell, function, name);
|
| if (!maybe_code->ToObject(&code)) return maybe_code;
|
| @@ -785,6 +881,7 @@
|
| ASSERT_EQ(flags, Code::cast(code)->flags());
|
| PROFILE(CodeCreateEvent(CALL_LOGGER_TAG(kind, CALL_IC_TAG),
|
| Code::cast(code), name));
|
| + GDBJIT(AddCode(GDBJITInterface::CALL_IC, name, Code::cast(code)));
|
| Object* result;
|
| { MaybeObject* maybe_result =
|
| map_holder->UpdateMapCodeCache(name, Code::cast(code));
|
| @@ -846,8 +943,12 @@
|
| Code* StubCache::FindCallInitialize(int argc,
|
| InLoopFlag in_loop,
|
| Code::Kind kind) {
|
| - Code::Flags flags =
|
| - Code::ComputeFlags(kind, in_loop, UNINITIALIZED, NORMAL, argc);
|
| + Code::Flags flags = Code::ComputeFlags(kind,
|
| + in_loop,
|
| + UNINITIALIZED,
|
| + Code::kNoExtraICState,
|
| + NORMAL,
|
| + argc);
|
| Object* result = ProbeCache(isolate_, flags)->ToObjectUnchecked();
|
| ASSERT(result != isolate_->heap()->undefined_value());
|
| // This might be called during the marking phase of the collector
|
| @@ -859,8 +960,12 @@
|
| MaybeObject* StubCache::ComputeCallInitialize(int argc,
|
| InLoopFlag in_loop,
|
| Code::Kind kind) {
|
| - Code::Flags flags =
|
| - Code::ComputeFlags(kind, in_loop, UNINITIALIZED, NORMAL, argc);
|
| + Code::Flags flags = Code::ComputeFlags(kind,
|
| + in_loop,
|
| + UNINITIALIZED,
|
| + Code::kNoExtraICState,
|
| + NORMAL,
|
| + argc);
|
| Object* probe;
|
| { MaybeObject* maybe_probe = ProbeCache(isolate_, flags);
|
| if (!maybe_probe->ToObject(&probe)) return maybe_probe;
|
| @@ -904,8 +1009,12 @@
|
| MaybeObject* StubCache::ComputeCallPreMonomorphic(int argc,
|
| InLoopFlag in_loop,
|
| Code::Kind kind) {
|
| - Code::Flags flags =
|
| - Code::ComputeFlags(kind, in_loop, PREMONOMORPHIC, NORMAL, argc);
|
| + Code::Flags flags = Code::ComputeFlags(kind,
|
| + in_loop,
|
| + PREMONOMORPHIC,
|
| + Code::kNoExtraICState,
|
| + NORMAL,
|
| + argc);
|
| Object* probe;
|
| { MaybeObject* maybe_probe = ProbeCache(isolate_, flags);
|
| if (!maybe_probe->ToObject(&probe)) return maybe_probe;
|
| @@ -919,8 +1028,12 @@
|
| MaybeObject* StubCache::ComputeCallNormal(int argc,
|
| InLoopFlag in_loop,
|
| Code::Kind kind) {
|
| - Code::Flags flags =
|
| - Code::ComputeFlags(kind, in_loop, MONOMORPHIC, NORMAL, argc);
|
| + Code::Flags flags = Code::ComputeFlags(kind,
|
| + in_loop,
|
| + MONOMORPHIC,
|
| + Code::kNoExtraICState,
|
| + NORMAL,
|
| + argc);
|
| Object* probe;
|
| { MaybeObject* maybe_probe = ProbeCache(isolate_, flags);
|
| if (!maybe_probe->ToObject(&probe)) return maybe_probe;
|
| @@ -934,8 +1047,12 @@
|
| MaybeObject* StubCache::ComputeCallMegamorphic(int argc,
|
| InLoopFlag in_loop,
|
| Code::Kind kind) {
|
| - Code::Flags flags =
|
| - Code::ComputeFlags(kind, in_loop, MEGAMORPHIC, NORMAL, argc);
|
| + Code::Flags flags = Code::ComputeFlags(kind,
|
| + in_loop,
|
| + MEGAMORPHIC,
|
| + Code::kNoExtraICState,
|
| + NORMAL,
|
| + argc);
|
| Object* probe;
|
| { MaybeObject* maybe_probe = ProbeCache(isolate_, flags);
|
| if (!maybe_probe->ToObject(&probe)) return maybe_probe;
|
| @@ -949,8 +1066,13 @@
|
| MaybeObject* StubCache::ComputeCallMiss(int argc, Code::Kind kind) {
|
| // MONOMORPHIC_PROTOTYPE_FAILURE state is used to make sure that miss stubs
|
| // and monomorphic stubs are not mixed up together in the stub cache.
|
| - Code::Flags flags = Code::ComputeFlags(
|
| - kind, NOT_IN_LOOP, MONOMORPHIC_PROTOTYPE_FAILURE, NORMAL, argc);
|
| + Code::Flags flags = Code::ComputeFlags(kind,
|
| + NOT_IN_LOOP,
|
| + MONOMORPHIC_PROTOTYPE_FAILURE,
|
| + Code::kNoExtraICState,
|
| + NORMAL,
|
| + argc,
|
| + OWN_MAP);
|
| Object* probe;
|
| { MaybeObject* maybe_probe = ProbeCache(isolate_, flags);
|
| if (!maybe_probe->ToObject(&probe)) return maybe_probe;
|
| @@ -963,8 +1085,12 @@
|
|
|
| #ifdef ENABLE_DEBUGGER_SUPPORT
|
| MaybeObject* StubCache::ComputeCallDebugBreak(int argc, Code::Kind kind) {
|
| - Code::Flags flags =
|
| - Code::ComputeFlags(kind, NOT_IN_LOOP, DEBUG_BREAK, NORMAL, argc);
|
| + Code::Flags flags = Code::ComputeFlags(kind,
|
| + NOT_IN_LOOP,
|
| + DEBUG_BREAK,
|
| + Code::kNoExtraICState,
|
| + NORMAL,
|
| + argc);
|
| Object* probe;
|
| { MaybeObject* maybe_probe = ProbeCache(isolate_, flags);
|
| if (!maybe_probe->ToObject(&probe)) return maybe_probe;
|
| @@ -977,12 +1103,12 @@
|
|
|
| MaybeObject* StubCache::ComputeCallDebugPrepareStepIn(int argc,
|
| Code::Kind kind) {
|
| - Code::Flags flags =
|
| - Code::ComputeFlags(kind,
|
| - NOT_IN_LOOP,
|
| - DEBUG_PREPARE_STEP_IN,
|
| - NORMAL,
|
| - argc);
|
| + Code::Flags flags = Code::ComputeFlags(kind,
|
| + NOT_IN_LOOP,
|
| + DEBUG_PREPARE_STEP_IN,
|
| + Code::kNoExtraICState,
|
| + NORMAL,
|
| + argc);
|
| Object* probe;
|
| { MaybeObject* maybe_probe = ProbeCache(isolate_, flags);
|
| if (!maybe_probe->ToObject(&probe)) return maybe_probe;
|
| @@ -1277,6 +1403,7 @@
|
| USE(code);
|
| PROFILE(CodeCreateEvent(CALL_LOGGER_TAG(kind, CALL_INITIALIZE_TAG),
|
| code, code->arguments_count()));
|
| + GDBJIT(AddCode(GDBJITInterface::CALL_INITIALIZE, Code::cast(code)));
|
| return result;
|
| }
|
|
|
| @@ -1302,6 +1429,7 @@
|
| USE(code);
|
| PROFILE(CodeCreateEvent(CALL_LOGGER_TAG(kind, CALL_PRE_MONOMORPHIC_TAG),
|
| code, code->arguments_count()));
|
| + GDBJIT(AddCode(GDBJITInterface::CALL_PRE_MONOMORPHIC, Code::cast(code)));
|
| return result;
|
| }
|
|
|
| @@ -1324,6 +1452,7 @@
|
| USE(code);
|
| PROFILE(CodeCreateEvent(CALL_LOGGER_TAG(kind, CALL_NORMAL_TAG),
|
| code, code->arguments_count()));
|
| + GDBJIT(AddCode(GDBJITInterface::CALL_NORMAL, Code::cast(code)));
|
| return result;
|
| }
|
|
|
| @@ -1347,6 +1476,7 @@
|
| USE(code);
|
| PROFILE(CodeCreateEvent(CALL_LOGGER_TAG(kind, CALL_MEGAMORPHIC_TAG),
|
| code, code->arguments_count()));
|
| + GDBJIT(AddCode(GDBJITInterface::CALL_MEGAMORPHIC, Code::cast(code)));
|
| return result;
|
| }
|
|
|
| @@ -1369,6 +1499,7 @@
|
| USE(code);
|
| PROFILE(CodeCreateEvent(CALL_LOGGER_TAG(kind, CALL_MISS_TAG),
|
| code, code->arguments_count()));
|
| + GDBJIT(AddCode(GDBJITInterface::CALL_MISS, Code::cast(code)));
|
| return result;
|
| }
|
|
|
| @@ -1468,6 +1599,9 @@
|
| PROFILE(CodeCreateEvent(Logger::LOAD_IC_TAG,
|
| Code::cast(result->ToObjectUnchecked()),
|
| name));
|
| + GDBJIT(AddCode(GDBJITInterface::LOAD_IC,
|
| + name,
|
| + Code::cast(result->ToObjectUnchecked())));
|
| }
|
| return result;
|
| }
|
| @@ -1480,6 +1614,9 @@
|
| PROFILE(CodeCreateEvent(Logger::KEYED_LOAD_IC_TAG,
|
| Code::cast(result->ToObjectUnchecked()),
|
| name));
|
| + GDBJIT(AddCode(GDBJITInterface::LOAD_IC,
|
| + name,
|
| + Code::cast(result->ToObjectUnchecked())));
|
| }
|
| return result;
|
| }
|
| @@ -1492,6 +1629,9 @@
|
| PROFILE(CodeCreateEvent(Logger::STORE_IC_TAG,
|
| Code::cast(result->ToObjectUnchecked()),
|
| name));
|
| + GDBJIT(AddCode(GDBJITInterface::STORE_IC,
|
| + name,
|
| + Code::cast(result->ToObjectUnchecked())));
|
| }
|
| return result;
|
| }
|
| @@ -1504,6 +1644,9 @@
|
| PROFILE(CodeCreateEvent(Logger::KEYED_STORE_IC_TAG,
|
| Code::cast(result->ToObjectUnchecked()),
|
| name));
|
| + GDBJIT(AddCode(GDBJITInterface::KEYED_STORE_IC,
|
| + name,
|
| + Code::cast(result->ToObjectUnchecked())));
|
| }
|
| return result;
|
| }
|
| @@ -1512,11 +1655,13 @@
|
| CallStubCompiler::CallStubCompiler(int argc,
|
| InLoopFlag in_loop,
|
| Code::Kind kind,
|
| + Code::ExtraICState extra_ic_state,
|
| InlineCacheHolderFlag cache_holder)
|
| - : arguments_(argc)
|
| - , in_loop_(in_loop)
|
| - , kind_(kind)
|
| - , cache_holder_(cache_holder) {
|
| + : arguments_(argc),
|
| + in_loop_(in_loop),
|
| + kind_(kind),
|
| + extra_ic_state_(extra_ic_state),
|
| + cache_holder_(cache_holder) {
|
| }
|
|
|
|
|
| @@ -1553,6 +1698,7 @@
|
| int argc = arguments_.immediate();
|
| Code::Flags flags = Code::ComputeMonomorphicFlags(kind_,
|
| type,
|
| + extra_ic_state_,
|
| cache_holder_,
|
| in_loop_,
|
| argc);
|
| @@ -1578,6 +1724,7 @@
|
| Code* code = Code::cast(result);
|
| USE(code);
|
| PROFILE(CodeCreateEvent(Logger::STUB_TAG, code, "ConstructStub"));
|
| + GDBJIT(AddCode(GDBJITInterface::STUB, "ConstructStub", Code::cast(code)));
|
| return result;
|
| }
|
|
|
| @@ -1649,4 +1796,16 @@
|
| }
|
|
|
|
|
| +MaybeObject* ExternalArrayStubCompiler::GetCode(Code::Flags flags) {
|
| + Object* result;
|
| + { MaybeObject* maybe_result = GetCodeWithFlags(flags, "ExternalArrayStub");
|
| + if (!maybe_result->ToObject(&result)) return maybe_result;
|
| + }
|
| + Code* code = Code::cast(result);
|
| + USE(code);
|
| + PROFILE(CodeCreateEvent(Logger::STUB_TAG, code, "ExternalArrayStub"));
|
| + return result;
|
| +}
|
| +
|
| +
|
| } } // namespace v8::internal
|
|
|