Merge "Remove HNativeDebugInfo from start of basic blocks."

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

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

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

diff --cc compiler/optimizing/code_generator_mips64.h
index eb7315a,1ba44df..c298097
--- 1/compiler/optimizing/code_generator_mips64.h
--- 2/compiler/optimizing/code_generator_mips64.h
+++ b/compiler/optimizing/code_generator_mips64.h
@@@ -349,9 -349,11 +349,11 @@@ class CodeGeneratorMIPS64 : public Code
  
    void MoveFromReturnRegister(Location trg ATTRIBUTE_UNUSED,
                                Primitive::Type type ATTRIBUTE_UNUSED) OVERRIDE {
 -    UNIMPLEMENTED(FATAL);
 +    UNIMPLEMENTED(FATAL) << "Not implemented on MIPS64";
    }
  
+   void GenerateNop();
+ 
   private:
    // Labels for each block that will be compiled.
    Mips64Label* block_labels_;  // Indexed by block id.

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