commit 85b1811f0de0cb8fb2a9ae37f53c6056a2de6867
author Mathieu Chartier <mathieuc@google.com> Sat Aug 13 00:06:30 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Aug 13 00:06:31 2016 +0000
tree ba0f827f9a2ae2a0a46fb90ea456455c3530b469
parent 3469575a639a96b5c44a703aaa0bdab6040ff947
parent eb9d52b66f39919af19e0b01789444faacd47a10

Merge "Fix heap poisoning"

runtime/arch/x86_64/quick_entrypoints_x86_64.S

diff --git a/runtime/arch/x86_64/quick_entrypoints_x86_64.S b/runtime/arch/x86_64/quick_entrypoints_x86_64.S
index 8a4a334..32768b0 100644
--- a/runtime/arch/x86_64/quick_entrypoints_x86_64.S
+++ b/runtime/arch/x86_64/quick_entrypoints_x86_64.S
@@ -1098,7 +1098,7 @@
                                                                // Store the class pointer in the
                                                                // header.
                                                                // No fence needed for x86.
-    POISON_HEAP_REF ecx
+    POISON_HEAP_REF r8d
     movl %r8d, MIRROR_OBJECT_CLASS_OFFSET(%rax)
     movl %esi, MIRROR_ARRAY_LENGTH_OFFSET(%rax)
     ret                                                        // Fast path succeeded.