summaryrefslogtreecommitdiffstats
path: root/compiler/dex/frontend.cc
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2015-01-26 13:29:31 -0800
committerMathieu Chartier <mathieuc@google.com>2015-01-26 13:30:44 -0800
commitf80b64121d2a138c3863898ec14942fe27c0270e (patch)
tree3e25f8b086d26d999bb05e8f51aaf602a0050ea2 /compiler/dex/frontend.cc
parent2ca19c23b9bc64c743a4cdbe9282ad4d995b398d (diff)
downloadandroid_art-f80b64121d2a138c3863898ec14942fe27c0270e.tar.gz
android_art-f80b64121d2a138c3863898ec14942fe27c0270e.tar.bz2
android_art-f80b64121d2a138c3863898ec14942fe27c0270e.zip
Add missing EndTiming in CompileMethod
DCHECK failure when running tests with JIT. Bug: 17950037 Change-Id: I4f886758b2a9322c2d7a8e8449e84c9a1709c813
Diffstat (limited to 'compiler/dex/frontend.cc')
-rw-r--r--compiler/dex/frontend.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/dex/frontend.cc b/compiler/dex/frontend.cc
index dd8b4c8a3d..0289b72f1c 100644
--- a/compiler/dex/frontend.cc
+++ b/compiler/dex/frontend.cc
@@ -156,6 +156,7 @@ static CompiledMethod* CompileMethod(CompilerDriver& driver,
if (!compiler->CanCompileMethod(method_idx, dex_file, &cu)) {
VLOG(compiler) << cu.instruction_set << ": Cannot compile method : "
<< PrettyMethod(method_idx, dex_file);
+ cu.EndTiming();
return nullptr;
}
@@ -164,6 +165,7 @@ static CompiledMethod* CompileMethod(CompilerDriver& driver,
if (cu.mir_graph->SkipCompilation(&skip_message)) {
VLOG(compiler) << cu.instruction_set << ": Skipping method : "
<< PrettyMethod(method_idx, dex_file) << " Reason = " << skip_message;
+ cu.EndTiming();
return nullptr;
}
@@ -175,6 +177,7 @@ static CompiledMethod* CompileMethod(CompilerDriver& driver,
if (cu.compiler_driver->ProfilePresent()
&& !cu.mir_graph->MethodIsLeaf()
&& cu.mir_graph->SkipCompilationByName(PrettyMethod(method_idx, dex_file))) {
+ cu.EndTiming();
return nullptr;
}
@@ -203,6 +206,7 @@ static CompiledMethod* CompileMethod(CompilerDriver& driver,
if (cu.mir_graph->PuntToInterpreter()) {
VLOG(compiler) << cu.instruction_set << ": Punted method to interpreter: "
<< PrettyMethod(method_idx, dex_file);
+ cu.EndTiming();
return nullptr;
}