commit 9235ed3182eb19d04240b0a4367481ef2d9a25a7
author Vladimir Marko <vmarko@google.com> Wed Dec 18 10:01:07 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 18 10:01:08 2013 +0000
tree be1888476536dfbee694e91f352728e709f11e4f
parent 7db86629a227724e61dbe24d3132260072fa04b3
parent 778127aed722b9702a382f1276c0f05447c654be

Merge "Fix build - style issues."

compiler/dex/quick/dex_file_method_inliner.cc

diff --git a/compiler/dex/quick/dex_file_method_inliner.cc b/compiler/dex/quick/dex_file_method_inliner.cc
index 3c331e1..c21ddcc 100644
--- a/compiler/dex/quick/dex_file_method_inliner.cc
+++ b/compiler/dex/quick/dex_file_method_inliner.cc
@@ -510,7 +510,9 @@
   WriterMutexLock mu(Thread::Current(), lock_);
   InlineMethod* im = &inline_methods_[method_idx];
   if (im->flags == 0) {
-    *im = InlineMethod{opcode, flags, data};
+    im->opcode = opcode;
+    im->flags = flags;
+    im->data = data;
     return true;
   } else {
     // TODO: Warning about a method being already inlined?

compiler/dex/quick/dex_file_method_inliner.h

diff --git a/compiler/dex/quick/dex_file_method_inliner.h b/compiler/dex/quick/dex_file_method_inliner.h
index 06de4fe..1d99731 100644
--- a/compiler/dex/quick/dex_file_method_inliner.h
+++ b/compiler/dex/quick/dex_file_method_inliner.h
@@ -373,8 +373,8 @@
 
     bool AnalyseReturnMethod(int32_t method_idx, const DexFile::CodeItem* code_item,
                              OpSize size) LOCKS_EXCLUDED(lock_);
-    bool AnalyseConstMethod(int32_t method_idx, const DexFile::CodeItem* code_item
-                            ) LOCKS_EXCLUDED(lock_);
+    bool AnalyseConstMethod(int32_t method_idx, const DexFile::CodeItem* code_item)
+                            LOCKS_EXCLUDED(lock_);
     bool AnalyseIGetMethod(int32_t method_idx, const DexFile::CodeItem* code_item,
                            OpSize size, bool is_object) LOCKS_EXCLUDED(lock_);
     bool AnalyseIPutMethod(int32_t method_idx, const DexFile::CodeItem* code_item,