summaryrefslogtreecommitdiff
path: root/compiler/optimizing/optimizing_compiler.cc
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2015-10-06 15:19:02 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-10-06 15:19:02 +0000
commit0050cc73c0b24710bf593a8cbafa082248f73730 (patch)
tree58407390e43ad5706ae3e4ae35eb25486094dfac /compiler/optimizing/optimizing_compiler.cc
parenta5ed7830458707c9ec10afc80163e481c2da9eaf (diff)
parent51d70f1744493d75e5cef946b7f5e398d0df4d3d (diff)
am 51d70f17: Merge "Optimizing: Disable -Wframe-larger-than= for CompileOptimized()."
* commit '51d70f1744493d75e5cef946b7f5e398d0df4d3d': Optimizing: Disable -Wframe-larger-than= for CompileOptimized().
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
-rw-r--r--compiler/optimizing/optimizing_compiler.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index 5177b9a794..12d6b03a12 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -562,6 +562,9 @@ static ArenaVector<LinkerPatch> EmitAndSortLinkerPatches(CodeGenerator* codegen)
return linker_patches;
}
+// TODO: The function below uses too much stack space. Bug: 24698147
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wframe-larger-than="
CompiledMethod* OptimizingCompiler::CompileOptimized(HGraph* graph,
CodeGenerator* codegen,
CompilerDriver* compiler_driver,
@@ -611,6 +614,7 @@ CompiledMethod* OptimizingCompiler::CompileOptimized(HGraph* graph,
soa.Self()->TransitionFromSuspendedToRunnable();
return compiled_method;
}
+#pragma GCC diagnostic pop
CompiledMethod* OptimizingCompiler::CompileBaseline(
CodeGenerator* codegen,