diff options
| author | 2016-02-23 11:12:17 +0000 | |
|---|---|---|
| committer | 2016-02-23 11:43:48 +0000 | |
| commit | b42a74309abad270fdbdef3b08d3d49c5489aba1 (patch) | |
| tree | 994ce218ff17a07341f4175e672bab8b989231e8 /compiler/driver/compiler_driver.cc | |
| parent | b7555a478a1d2b16ad2093c8499449bfd3bf9bc8 (diff) | |
| parent | 6ade0991cdca639831c34e0c7eab823f5ae1e2c6 (diff) | |
Merge remote-tracking branch 'goog/master' into nyc-dev
bug:27173201
bug:23128949
bug:26846185
Change-Id: I7333734be71a83dc4808735ead80ae3a4dcd841d
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 670fe94988..db8c3abccf 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -378,7 +378,6 @@ CompilerDriver::CompilerDriver(        compiled_method_storage_(swap_fd),        profile_compilation_info_(profile_compilation_info) {    DCHECK(compiler_options_ != nullptr); -  DCHECK(verification_results_ != nullptr);    DCHECK(method_inliner_map_ != nullptr);    compiler_->Init(); @@ -2493,6 +2492,7 @@ void CompilerDriver::Compile(jobject class_loader,                     parallel_thread_pool_.get(),                     parallel_thread_count_,                     timings); +    Runtime::Current()->ReclaimArenaPoolMemory();    }    VLOG(compiler) << "Compile: " << GetMemoryUsageString(false);  } |