Various fixes.
CHECK_xx arguments should be the "right" way round, not backwards like
ASSERT_xx and EXPECT_xx.
Use /mnt/sdcard/ rather than /sdcard/ to bypass FUSE and avoid getting
intermittent mkdir(2) "Device or resource busy" failures.
Better diagnostics when methods not found by test helpers.
Remove the whitelist from oatCompileMethod.
Leave evidence in the log of what we've compiled and where we put it.
Disable card marking by generated code until we have a cards to mark.
Distinguish between CanPutArrayElementFromCode and CanPutArrayElement.
Implement both.
Add a new test to see how much of the basic System and String/StringBuilder
facilities are working.
Change-Id: Ie24f2859e404ab912e6cc77d170ceb4df5ecdf19
diff --git a/src/compiler/Frontend.cc b/src/compiler/Frontend.cc
index e9f8a3a..64d701e 100644
--- a/src/compiler/Frontend.cc
+++ b/src/compiler/Frontend.cc
@@ -699,40 +699,7 @@
*/
bool oatCompileMethod(Method* method, art::InstructionSet insnSet)
{
- bool compiling = true;
- if (!method->IsStatic()) {
- compiling = false; // assume skip
- if (PrettyMethod(method).find("virtualCall") != std::string::npos) {
- compiling = true;
- }
- if (PrettyMethod(method).find("tryThing") != std::string::npos) {
- compiling = true;
- }
- if (PrettyMethod(method).find("getFoo") != std::string::npos) {
- compiling = true;
- }
- if (PrettyMethod(method).find("setFoo") != std::string::npos) {
- compiling = true;
- }
- if (PrettyMethod(method).find("IntMath.<init>") != std::string::npos) {
- compiling = true;
- }
- if (PrettyMethod(method).find("IntMathBase.<init>") != std::string::npos) {
- compiling = true;
- }
- if (PrettyMethod(method).find("java.lang.Object.<init>") != std::string::npos) {
- compiling = true;
- }
- } else if (method->GetName()->ToModifiedUtf8().find("foo") != std::string::npos) {
- compiling = false;
- }
-
- if (compiling) {
- LOG(INFO) << "Compiling " << PrettyMethod(method);
- } else {
- LOG(INFO) << "not compiling " << PrettyMethod(method);
- return false;
- }
+ LOG(INFO) << "Compiling " << PrettyMethod(method) << "...";
CompilationUnit cUnit;
art::ClassLinker* class_linker = art::Runtime::Current()->GetClassLinker();
@@ -930,6 +897,9 @@
method->SetFrameSizeInBytes(cUnit.frameSize);
method->SetCoreSpillMask(cUnit.coreSpillMask);
method->SetFpSpillMask(cUnit.fpSpillMask);
+ LOG(INFO) << "Compiled " << PrettyMethod(method)
+ << " code at " << reinterpret_cast<void*>(managed_code->GetData())
+ << " (" << managed_code->GetLength() << " bytes)";
// TODO: Transmit mapping table to caller
#if 0