diff options
| author | 2016-08-13 00:06:30 +0000 | |
|---|---|---|
| committer | 2016-08-13 00:06:31 +0000 | |
| commit | 85b1811f0de0cb8fb2a9ae37f53c6056a2de6867 (patch) | |
| tree | ba0f827f9a2ae2a0a46fb90ea456455c3530b469 | |
| parent | 3469575a639a96b5c44a703aaa0bdab6040ff947 (diff) | |
| parent | eb9d52b66f39919af19e0b01789444faacd47a10 (diff) | |
Merge "Fix heap poisoning"
| -rw-r--r-- | runtime/arch/x86_64/quick_entrypoints_x86_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/arch/x86_64/quick_entrypoints_x86_64.S b/runtime/arch/x86_64/quick_entrypoints_x86_64.S index 8a4a334fb8..32768b0263 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 @@ MACRO1(ALLOC_ARRAY_TLAB_FAST_PATH_RESOLVED, slowPathLabel) // 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. |