1 files changed, 7 insertions, 4 deletions
diff --git a/compiler/common_compiler_test.h b/compiler/common_compiler_test.h
index 8317d7f48a..89cc1fa28f 100644
--- a/compiler/common_compiler_test.h
+++ b/compiler/common_compiler_test.h
@@ -50,11 +50,14 @@ class CommonCompilerTestImpl {
   CommonCompilerTestImpl();
   virtual ~CommonCompilerTestImpl();
 
+  // Create an executable copy of the code with given metadata.
+  const void* MakeExecutable(ArrayRef<const uint8_t> code,
+                             ArrayRef<const uint8_t> vmap_table,
+                             InstructionSet instruction_set);
+
   void MakeExecutable(ArtMethod* method, const CompiledMethod* compiled_method)
       REQUIRES_SHARED(Locks::mutator_lock_);
 
-  static void MakeExecutable(const void* code_start, size_t code_length);
-
  protected:
   void SetUp();
 
@@ -100,8 +103,8 @@ class CommonCompilerTestImpl {
   virtual Runtime* GetRuntime() = 0;
 
  private:
-  // Chunks must not move their storage after being created - use the node-based std::list.
-  std::list<std::vector<uint8_t>> header_code_and_maps_chunks_;
+  class CodeAndMetadata;
+  std::vector<CodeAndMetadata> code_and_metadata_;
 };
 
 template <typename RuntimeBase>