From 0b4267720380ca746abb9090364cea9ee6cb1435 Mon Sep 17 00:00:00 2001 From: David Sehr Date: Tue, 3 Jul 2018 23:03:42 +0000 Subject: Revert "Refactor DexFile ownership" This reverts commit b095f022a9683a9123018c01e22595cf969fd88b. Reason for revert: Caused huge interpreter performance regression. Change-Id: I0f27f8f234d315807695362bf679ef47f68723f7 --- compiler/optimizing/optimizing_unit_test.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'compiler/optimizing/optimizing_unit_test.h') diff --git a/compiler/optimizing/optimizing_unit_test.h b/compiler/optimizing/optimizing_unit_test.h index e44d7b82e5..f903f82d50 100644 --- a/compiler/optimizing/optimizing_unit_test.h +++ b/compiler/optimizing/optimizing_unit_test.h @@ -130,10 +130,12 @@ class OptimizingUnitTestHelper { // Create the dex file based on the fake data. Call the constructor so that we can use virtual // functions. Don't use the arena for the StandardDexFile otherwise the dex location leaks. dex_files_.emplace_back(new StandardDexFile( - std::make_unique(dex_data, sizeof(StandardDexFile::Header)), + dex_data, + sizeof(StandardDexFile::Header), "no_location", /*location_checksum*/ 0, - /*oat_dex_file*/ nullptr)); + /*oat_dex_file*/ nullptr, + /*container*/ nullptr)); return new (allocator) HGraph( allocator, -- cgit v1.2.3-59-g8ed1b