Merge "Fix method index for GDB information"
diff --git a/compiler/oat_writer.cc b/compiler/oat_writer.cc
index c5219a6..a07aebc 100644
--- a/compiler/oat_writer.cc
+++ b/compiler/oat_writer.cc
@@ -398,7 +398,7 @@
           (*cfi_info)[offset_to_update+1] = new_value >> 8;
           (*cfi_info)[offset_to_update+2] = new_value >> 16;
           (*cfi_info)[offset_to_update+3] = new_value >> 24;
-          method_info_.push_back(DebugInfo(PrettyMethod(class_def_method_index, dex_file, false),
+          method_info_.push_back(DebugInfo(PrettyMethod(method_idx, dex_file, false),
                                            new_value, new_value + code_size));
         }
       }