commit 0b4267720380ca746abb9090364cea9ee6cb1435
author David Sehr <sehr@google.com> Tue Jul 03 23:03:42 2018 +0000
committer David Sehr <sehr@google.com> Tue Jul 03 23:03:56 2018 +0000
tree 3e330d7241d5608858b9084a246a4bb8b88b070f
parent 7583d915800ad330da0232dfdb0a4d1bda2d074c

Revert "Refactor DexFile ownership"

This reverts commit b095f022a9683a9123018c01e22595cf969fd88b.

Reason for revert: Caused huge interpreter performance regression.

Change-Id: I0f27f8f234d315807695362bf679ef47f68723f7

runtime/class_linker_test.cc

diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc
index 2a2aff1..e40f1db 100644
--- a/runtime/class_linker_test.cc
+++ b/runtime/class_linker_test.cc
@@ -1521,12 +1521,12 @@
   dex_cache->SetLocation(location.Get());
   const DexFile* old_dex_file = dex_cache->GetDexFile();
 
-  std::unique_ptr<DexFile> dex_file(
-      new StandardDexFile(std::make_unique<NonOwningDexFileContainer>(old_dex_file->Begin(),
-                                                                      old_dex_file->Size()),
-                          location->ToModifiedUtf8(),
-                          0u,
-                          nullptr));
+  std::unique_ptr<DexFile> dex_file(new StandardDexFile(old_dex_file->Begin(),
+                                                        old_dex_file->Size(),
+                                                        location->ToModifiedUtf8(),
+                                                        0u,
+                                                        nullptr,
+                                                        nullptr));
   {
     WriterMutexLock mu(soa.Self(), *Locks::dex_lock_);
     // Check that inserting with a UTF16 name works.