diff options
| author | 2016-10-12 13:05:08 +0000 | |
|---|---|---|
| committer | 2016-10-12 13:05:09 +0000 | |
| commit | e2ced0db78b89b778cd1c9ef4ace5dec7dbc66b0 (patch) | |
| tree | dab2f5494978cb5119fb000a3c0f4261c998f470 /compiler/driver/compiler_driver.cc | |
| parent | f0ab2ec6008bbd495e59bb9bf81ac399d864f38b (diff) | |
| parent | b20f1feff8b1125ecf1f7d4537ed4d6eb002973f (diff) | |
Merge "Address revew comments for change Ia653d2c72df13889dc85dd8c84997582c034ea4b."
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index e2f8d929c3..414a43c8ec 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -472,7 +472,8 @@ static void SetupIntrinsic(Thread* self, ? cls->FindDeclaredDirectMethod(method_name, signature, image_size) : cls->FindDeclaredVirtualMethod(method_name, signature, image_size); if (method == nullptr) { - LOG(FATAL) << "Could not find method of intrinsic " << class_name << method_name << signature; + LOG(FATAL) << "Could not find method of intrinsic " + << class_name << " " << method_name << " " << signature; } DCHECK_EQ(method->GetInvokeType(), invoke_type); method->SetIntrinsic(static_cast<uint32_t>(intrinsic)); @@ -497,11 +498,13 @@ void CompilerDriver::CompileAll(jobject class_loader, // those compilations will pick up a boot image that have the ArtMethod already // set with the intrinsics flag. ScopedObjectAccess soa(Thread::Current()); -#define OPTIMIZING_INTRINSICS(Name, InvokeType, NeedsEnvironmentOrCache, SideEffects, Exceptions, ClassName, MethodName, Signature) \ +#define SETUP_INTRINSICS(Name, InvokeType, NeedsEnvironmentOrCache, SideEffects, Exceptions, \ + ClassName, MethodName, Signature) \ SetupIntrinsic(soa.Self(), Intrinsics::k##Name, InvokeType, ClassName, MethodName, Signature); #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) +INTRINSICS_LIST(SETUP_INTRINSICS) #undef INTRINSICS_LIST +#undef SETUP_INTRINSICS } // Compile: // 1) Compile all classes and methods enabled for compilation. May fall back to dex-to-dex |