summaryrefslogtreecommitdiff
path: root/compiler/driver/compiler_driver.cc
diff options
context:
space:
mode:
author Brian Carlstrom <bdc@google.com> 2013-07-17 21:52:23 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-07-17 21:52:23 -0700
commit98c19d201b83119cbadd9aa3966fd0fb86064813 (patch)
treeda0981e93c3a8b65d7686361ea169b88cf761051 /compiler/driver/compiler_driver.cc
parent1761e7b083d89f2070fe1e10c5915e2400359b10 (diff)
parent2ce745c06271d5223d57dbf08117b20d5b60694a (diff)
am 2ce745c0: Fix cpplint whitespace/braces issues
* commit '2ce745c06271d5223d57dbf08117b20d5b60694a': Fix cpplint whitespace/braces issues
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
-rw-r--r--compiler/driver/compiler_driver.cc13
1 files changed, 5 insertions, 8 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index 89f57b1d1c..67adae6498 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -356,14 +356,14 @@ CompilerDriver::CompilerDriver(CompilerBackend compiler_backend, InstructionSet
jni_compiler_(NULL),
compiler_enable_auto_elf_loading_(NULL),
compiler_get_method_code_addr_(NULL),
- support_boot_image_fixup_(true)
-{
+ support_boot_image_fixup_(true) {
+
CHECK_PTHREAD_CALL(pthread_key_create, (&tls_key_, NULL), "compiler tls key");
// TODO: more work needed to combine initializations and allow per-method backend selection
typedef void (*InitCompilerContextFn)(CompilerDriver&);
InitCompilerContextFn init_compiler_context;
- if (compiler_backend_ == kPortable){
+ if (compiler_backend_ == kPortable) {
// Initialize compiler_context_
init_compiler_context = reinterpret_cast<void (*)(CompilerDriver&)>(ArtInitCompilerContext);
compiler_ = reinterpret_cast<CompilerFn>(ArtCompileMethod);
@@ -1411,10 +1411,7 @@ class ParallelCompilationManager {
begin_(begin),
end_(end),
callback_(callback),
- stripe_(stripe)
- {
-
- }
+ stripe_(stripe) {}
virtual void Run(Thread* self) {
for (size_t i = begin_; i < end_; i += stripe_) {
@@ -2095,7 +2092,7 @@ static void InitializeClass(const ParallelCompilationManager* manager, size_t cl
}
if (!is_black_listed) {
LOG(INFO) << "Initializing: " << descriptor;
- if (StringPiece(descriptor) == "Ljava/lang/Void;"){
+ if (StringPiece(descriptor) == "Ljava/lang/Void;") {
// Hand initialize j.l.Void to avoid Dex file operations in un-started runtime.
mirror::ObjectArray<mirror::Field>* fields = klass->GetSFields();
CHECK_EQ(fields->GetLength(), 1);