Merge "Add OptimizingCompilerStats to the CodeGenerator class."

diff --cc compiler/optimizing/code_generator.cc
Simple merge

diff --cc compiler/optimizing/code_generator.h
index 11daf3f,f945564..d2af56a
--- 1/compiler/optimizing/code_generator.h
--- 2/compiler/optimizing/code_generator.h
+++ b/compiler/optimizing/code_generator.h
@@@ -409,9 -397,9 +414,10 @@@ class CodeGenerator 
          block_order_(nullptr),
          is_baseline_(false),
          disasm_info_(nullptr),
+         stats_(stats),
          graph_(graph),
          compiler_options_(compiler_options),
 +        src_map_(nullptr),
          slow_paths_(graph->GetArena(), 8),
          current_block_index_(0),
          is_leaf_(true),

diff --cc compiler/optimizing/code_generator_arm.cc
Simple merge

diff --cc compiler/optimizing/code_generator_arm.h
Simple merge

diff --cc compiler/optimizing/code_generator_arm64.cc
Simple merge

diff --cc compiler/optimizing/code_generator_arm64.h
Simple merge

diff --cc compiler/optimizing/code_generator_mips64.cc
Simple merge

diff --cc compiler/optimizing/code_generator_mips64.h
Simple merge

diff --cc compiler/optimizing/code_generator_x86.cc
Simple merge

diff --cc compiler/optimizing/code_generator_x86.h
Simple merge

diff --cc compiler/optimizing/code_generator_x86_64.cc
Simple merge

diff --cc compiler/optimizing/code_generator_x86_64.h
Simple merge