From 880934b1a81503117ff5dff3de04ceaf9f011eff Mon Sep 17 00:00:00 2001 From: "yurys@chromium.org" Date: Mon, 3 Jun 2013 09:46:32 +0000 Subject: [PATCH] Remove unnecessary check from Logger::LogCodeObject Logger::LogCodeObjects is the only caller of the method. And all its call sites check for at least one of the coditions before calling LogCodeObjects. So there is no need to check it again. BUG=None R=jkummerow@chromium.org, loislo@chromium.org Review URL: https://codereview.chromium.org/15980007 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14913 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/cpu-profiler.cc | 3 -- src/log.cc | 98 ++++++++++++++++++++++++++--------------------------- 2 files changed, 48 insertions(+), 53 deletions(-) diff --git a/src/cpu-profiler.cc b/src/cpu-profiler.cc index c30d4d4..4272219 100644 --- a/src/cpu-profiler.cc +++ b/src/cpu-profiler.cc @@ -461,10 +461,7 @@ void CpuProfiler::StartProcessorIfNotStarted() { // Enumerate stuff we already have in the heap. if (isolate_->heap()->HasBeenSetUp()) { if (!FLAG_prof_browser_mode) { - bool saved_log_code_flag = FLAG_log_code; - FLAG_log_code = true; isolate_->logger()->LogCodeObjects(); - FLAG_log_code = saved_log_code_flag; } isolate_->logger()->LogCompiledFunctions(); isolate_->logger()->LogAccessorCallbacks(); diff --git a/src/log.cc b/src/log.cc index 00fa432..a152c33 100644 --- a/src/log.cc +++ b/src/log.cc @@ -1581,57 +1581,55 @@ static int EnumerateCompiledFunctions(Heap* heap, void Logger::LogCodeObject(Object* object) { - if (FLAG_log_code || FLAG_ll_prof || is_logging_code_events()) { - Code* code_object = Code::cast(object); - LogEventsAndTags tag = Logger::STUB_TAG; - const char* description = "Unknown code from the snapshot"; - switch (code_object->kind()) { - case Code::FUNCTION: - case Code::OPTIMIZED_FUNCTION: - return; // We log this later using LogCompiledFunctions. - case Code::UNARY_OP_IC: // fall through - case Code::BINARY_OP_IC: // fall through - case Code::COMPARE_IC: // fall through - case Code::COMPARE_NIL_IC: // fall through - case Code::TO_BOOLEAN_IC: // fall through - case Code::STUB: - description = - CodeStub::MajorName(CodeStub::GetMajorKey(code_object), true); - if (description == NULL) - description = "A stub from the snapshot"; - tag = Logger::STUB_TAG; - break; - case Code::BUILTIN: - description = "A builtin from the snapshot"; - tag = Logger::BUILTIN_TAG; - break; - case Code::KEYED_LOAD_IC: - description = "A keyed load IC from the snapshot"; - tag = Logger::KEYED_LOAD_IC_TAG; - break; - case Code::LOAD_IC: - description = "A load IC from the snapshot"; - tag = Logger::LOAD_IC_TAG; - break; - case Code::STORE_IC: - description = "A store IC from the snapshot"; - tag = Logger::STORE_IC_TAG; - break; - case Code::KEYED_STORE_IC: - description = "A keyed store IC from the snapshot"; - tag = Logger::KEYED_STORE_IC_TAG; - break; - case Code::CALL_IC: - description = "A call IC from the snapshot"; - tag = Logger::CALL_IC_TAG; - break; - case Code::KEYED_CALL_IC: - description = "A keyed call IC from the snapshot"; - tag = Logger::KEYED_CALL_IC_TAG; - break; - } - PROFILE(isolate_, CodeCreateEvent(tag, code_object, description)); + Code* code_object = Code::cast(object); + LogEventsAndTags tag = Logger::STUB_TAG; + const char* description = "Unknown code from the snapshot"; + switch (code_object->kind()) { + case Code::FUNCTION: + case Code::OPTIMIZED_FUNCTION: + return; // We log this later using LogCompiledFunctions. + case Code::UNARY_OP_IC: // fall through + case Code::BINARY_OP_IC: // fall through + case Code::COMPARE_IC: // fall through + case Code::COMPARE_NIL_IC: // fall through + case Code::TO_BOOLEAN_IC: // fall through + case Code::STUB: + description = + CodeStub::MajorName(CodeStub::GetMajorKey(code_object), true); + if (description == NULL) + description = "A stub from the snapshot"; + tag = Logger::STUB_TAG; + break; + case Code::BUILTIN: + description = "A builtin from the snapshot"; + tag = Logger::BUILTIN_TAG; + break; + case Code::KEYED_LOAD_IC: + description = "A keyed load IC from the snapshot"; + tag = Logger::KEYED_LOAD_IC_TAG; + break; + case Code::LOAD_IC: + description = "A load IC from the snapshot"; + tag = Logger::LOAD_IC_TAG; + break; + case Code::STORE_IC: + description = "A store IC from the snapshot"; + tag = Logger::STORE_IC_TAG; + break; + case Code::KEYED_STORE_IC: + description = "A keyed store IC from the snapshot"; + tag = Logger::KEYED_STORE_IC_TAG; + break; + case Code::CALL_IC: + description = "A call IC from the snapshot"; + tag = Logger::CALL_IC_TAG; + break; + case Code::KEYED_CALL_IC: + description = "A keyed call IC from the snapshot"; + tag = Logger::KEYED_CALL_IC_TAG; + break; } + PROFILE(isolate_, CodeCreateEvent(tag, code_object, description)); } -- 2.7.4