Merge changes from topic 'pointer_conversion'

* changes:
  Pass template args down
  Fix pointer conversion error in SetElementPtrSize

1 files changed, 8 insertions, 0 deletions

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index bb709e8774..44cc9b7bf2 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -1533,6 +1533,14 @@ bool ClassLinker::AddImageSpace(
         }
       }
       if (!equal) {
+        VLOG(image) << "Image dex files " << image_dex_file_names.size();
+        for (mirror::String* name : image_dex_file_names) {
+          VLOG(image) << name->ToModifiedUtf8();
+        }
+        VLOG(image) << "Loader dex files " << loader_dex_file_names.size();
+        for (mirror::String* name : loader_dex_file_names) {
+          VLOG(image) << name->ToModifiedUtf8();
+        }
         *error_msg = "Rejecting application image due to class loader mismatch";
         return false;
       }