commit dc23d8318db08cb42e20f1d16dbc416798951a8b
author Nicolas Geoffray <ngeoffray@google.com> Mon Feb 16 11:15:43 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Feb 18 09:53:32 2015 +0000
tree e7a883bb3263ccb971898df98bc58700604c1d1d
parent e5f5953e744060fde3b4489cea4d934d529e3e32

Avoid generating jmp +0.

When a block branches to a non-following block, but blocks
in-between do branch to it, we can avoid doing the branch.

Change-Id: I9b343f662a4efc718cd4b58168f93162a24e1219

compiler/optimizing/code_generator_x86_64.h

diff --git a/compiler/optimizing/code_generator_x86_64.h b/compiler/optimizing/code_generator_x86_64.h
index dbdbf86..707c999 100644
--- a/compiler/optimizing/code_generator_x86_64.h
+++ b/compiler/optimizing/code_generator_x86_64.h
@@ -232,7 +232,7 @@
   void LoadCurrentMethod(CpuRegister reg);
 
   Label* GetLabelOf(HBasicBlock* block) const {
-    return block_labels_.GetRawStorage() + block->GetBlockId();
+    return CommonGetLabelOf<Label>(block_labels_.GetRawStorage(), block);
   }
 
   void Initialize() OVERRIDE {