commit 3c911d68f10e5ee7c7055bac63ac8f523949e37d
author Brian Carlstrom <bdc@google.com> Fri Jun 13 18:23:20 2014 -0700
committer Brian Carlstrom <bdc@google.com> Fri Jun 13 22:38:25 2014 -0700
tree ba0f30969e52a127fb28f34f6b5be4983953973d
parent b2192ffe6897da6bfd6165db7ce476cba1cd07ae

Add extra information to InitImageMethodVisitor CHECK

Bug: 15616246

(cherry picked from commit 21f1740e845505bf437dcf128912ce218ff92af9)

Change-Id: Ib698229cd56151c682d44e8dd59d8df18fb5a393

compiler/oat_writer.cc

diff --git a/compiler/oat_writer.cc b/compiler/oat_writer.cc
index 65bc318..c6b9161 100644
--- a/compiler/oat_writer.cc
+++ b/compiler/oat_writer.cc
@@ -535,7 +535,7 @@
                                                       NullHandle<mirror::ClassLoader>(),
                                                       NullHandle<mirror::ArtMethod>(),
                                                       invoke_type);
-    CHECK(method != NULL);
+    CHECK(method != NULL) << PrettyMethod(it.GetMemberIndex(), *dex_file_, true);
     // Portable code offsets are set by ElfWriterMclinker::FixupCompiledCodeOffset after linking.
     method->SetQuickOatCodeOffset(offsets.code_offset_);
     method->SetOatNativeGcMapOffset(offsets.gc_map_offset_);