diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 9 | ||||
| -rw-r--r-- | compiler/intrinsics_list.h | 4 |
2 files changed, 8 insertions, 5 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 diff --git a/compiler/intrinsics_list.h b/compiler/intrinsics_list.h index 5877f57b74..b617387ef8 100644 --- a/compiler/intrinsics_list.h +++ b/compiler/intrinsics_list.h @@ -1,7 +1,7 @@ /* - * Copyright (C, "", "", "") 2015 The Android Open Source Project + * Copyright (C) 2015 The Android Open Source Project * - * Licensed under the Apache License, Version 2.0 (the "License", "", "", ""); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * |