summaryrefslogtreecommitdiff
path: root/src/compiler/Frontend.cc
diff options
context:
space:
mode:
author buzbee <buzbee@google.com> 2012-07-03 15:30:31 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2012-07-03 15:30:31 -0700
commitcfab1d9ac52064e6d15e520a76014e6dfb24558c (patch)
tree5e764ca87803a42201f36e020e49a7dcb81f6d6e /src/compiler/Frontend.cc
parentd383283c116f36d34a179cc0433a1f609171fd2a (diff)
parent1d8fc2ac0748b06a0c216c572b284e0d71bb24d4 (diff)
am 1d8fc2ac: Merge "Quick compiler - packed switch support" into ics-mr1-plus-art
* commit '1d8fc2ac0748b06a0c216c572b284e0d71bb24d4': Quick compiler - packed switch support
Diffstat (limited to 'src/compiler/Frontend.cc')
-rw-r--r--src/compiler/Frontend.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/compiler/Frontend.cc b/src/compiler/Frontend.cc
index b714065c9f..9fa69115a1 100644
--- a/src/compiler/Frontend.cc
+++ b/src/compiler/Frontend.cc
@@ -246,6 +246,12 @@ BasicBlock *findBlock(CompilationUnit* cUnit, unsigned int codeOffset,
return bb;
}
+/* Find existing block */
+BasicBlock* oatFindBlock(CompilationUnit* cUnit, unsigned int codeOffset)
+{
+ return findBlock(cUnit, codeOffset, false, false, NULL);
+}
+
/* Turn method name into a legal Linux file name */
void oatReplaceSpecialChars(std::string& str)
{
@@ -781,7 +787,7 @@ CompiledMethod* oatCompileMethod(Compiler& compiler,
|| (PrettyMethod(method_idx, dex_file).find("FloatMath") != std::string::npos)
|| (PrettyMethod(method_idx, dex_file).find("Goto") != std::string::npos)
|| (PrettyMethod(method_idx, dex_file).find("InternedString") != std::string::npos)
- // || (PrettyMethod(method_idx, dex_file).find("IntMath") != std::string::npos)
+ || (PrettyMethod(method_idx, dex_file).find("IntMath") != std::string::npos)
|| (PrettyMethod(method_idx, dex_file).find("InstField") != std::string::npos)
|| (PrettyMethod(method_idx, dex_file).find("MethodCall") != std::string::npos)
|| (PrettyMethod(method_idx, dex_file).find("Monitor") != std::string::npos)