commit c393d63aa2b8f6984672fdd4de631bbeff14b6a2
author Alexandre Rames <alexandre.rames@linaro.org> Fri Apr 15 11:54:06 2016 +0100
committer Roland Levillain <rpl@google.com> Mon Apr 18 12:32:48 2016 +0100
tree 1abc9c14828eee9a1eb903687e594dafe3f84440
parent d1ee80948144526b985afb44a0574248cf7da58a

Fix: correctly destruct VIXL labels.

(cherry picked from commit c01a66465a398ad15da90ab2bdc35b7f4a609b17)

Bug: 27505766
Change-Id: I077465e3d308f4331e7a861902e05865f9d99835

compiler/optimizing/code_generator_x86.h

diff --git a/compiler/optimizing/code_generator_x86.h b/compiler/optimizing/code_generator_x86.h
index 69a6253..1739eec 100644
--- a/compiler/optimizing/code_generator_x86.h
+++ b/compiler/optimizing/code_generator_x86.h
@@ -361,7 +361,7 @@
     return assembler_;
   }
 
-  uintptr_t GetAddressOf(HBasicBlock* block) const OVERRIDE {
+  uintptr_t GetAddressOf(HBasicBlock* block) OVERRIDE {
     return GetLabelOf(block)->Position();
   }