Convert CompilerTest over to use Compiler
Change-Id: Ie9ec6a021126f68acd3f6d35ebe73247b5cc360f
diff --git a/src/compiler/Frontend.cc b/src/compiler/Frontend.cc
index 8a3d8b2..1775375 100644
--- a/src/compiler/Frontend.cc
+++ b/src/compiler/Frontend.cc
@@ -697,14 +697,21 @@
*/
bool oatCompileMethod(Method* method, art::InstructionSet insnSet)
{
- if ((method->GetName()->ToModifiedUtf8().find("init>") !=
- std::string::npos) ||
- (method->GetName()->ToModifiedUtf8().find("foo") !=
- std::string::npos)) {
- LOG(INFO) << "not compiling " << PrettyMethod(method, false);
+ if (!method->IsStatic() ||
+ (method->GetName()->ToModifiedUtf8().find("foo") != std::string::npos) ||
+ (method->GetName()->ToModifiedUtf8().find("init>") != std::string::npos) ||
+ (method->GetName()->ToModifiedUtf8().find("intOperTest") != std::string::npos) ||
+ (method->GetName()->ToModifiedUtf8().find("intShiftTest") != std::string::npos) ||
+ (method->GetName()->ToModifiedUtf8().find("lit16Test") != std::string::npos) ||
+ (method->GetName()->ToModifiedUtf8().find("lit8Test") != std::string::npos) ||
+ (method->GetName()->ToModifiedUtf8().find("longOperTest") != std::string::npos) ||
+ (method->GetName()->ToModifiedUtf8().find("longShiftTest") != std::string::npos) ||
+ (method->GetName()->ToModifiedUtf8().find("shiftTest1") != std::string::npos) ||
+ (method->GetName()->ToModifiedUtf8().find("main") != std::string::npos)) {
+ LOG(INFO) << "not compiling " << PrettyMethod(method, true);
return false;
} else {
- LOG(INFO) << "Compiling " << PrettyMethod(method, false);
+ LOG(INFO) << "Compiling " << PrettyMethod(method, true);
}
CompilationUnit cUnit;
@@ -906,7 +913,7 @@
oatDumpCFG(&cUnit, "/sdcard/cfg/");
#endif
- return false;
+ return true;
}
void oatInit(void)