diff options
| author | 2014-12-22 18:30:07 +0000 | |
|---|---|---|
| committer | 2014-12-22 18:30:07 +0000 | |
| commit | 5c79aec9d53d1320041d5a52e5115d78d16035b7 (patch) | |
| tree | 0e36345912571fc0e3e01976f6b698b631706bb7 /compiler/optimizing/code_generator.h | |
| parent | 508d2665febbb06c853bfab131c4dc7164fffabb (diff) | |
| parent | e21dc3db191df04c100620965bee4617b3b24397 (diff) | |
Merge "ART: Swap-space in the compiler"
Diffstat (limited to 'compiler/optimizing/code_generator.h')
| -rw-r--r-- | compiler/optimizing/code_generator.h | 5 | 
1 files changed, 4 insertions, 1 deletions
| diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h index 1d42c47d56..2e7eca2ead 100644 --- a/compiler/optimizing/code_generator.h +++ b/compiler/optimizing/code_generator.h @@ -44,7 +44,10 @@ class Assembler;  class CodeGenerator;  class DexCompilationUnit;  class ParallelMoveResolver; +class SrcMapElem; +template <class Alloc>  class SrcMap; +using DefaultSrcMap = SrcMap<std::allocator<SrcMapElem>>;  class CodeAllocator {   public: @@ -146,7 +149,7 @@ class CodeGenerator : public ArenaObject<kArenaAllocMisc> {    void GenerateSlowPaths(); -  void BuildMappingTable(std::vector<uint8_t>* vector, SrcMap* src_map) const; +  void BuildMappingTable(std::vector<uint8_t>* vector, DefaultSrcMap* src_map) const;    void BuildVMapTable(std::vector<uint8_t>* vector) const;    void BuildNativeGCMap(        std::vector<uint8_t>* vector, const DexCompilationUnit& dex_compilation_unit) const; |