From: Martin Liska <mliska@suse.cz>
Date: Thu, 11 Jun 2020 07:34:41 +0000 (+0200)
Subject: asan: fix RTX emission for ilp32
X-Git-Tag: releases/gcc-9.4.0~891
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=187c96ea5310cef1977d8a44b0b9a6b561b6c8c7;p=thirdparty%2Fgcc.git

asan: fix RTX emission for ilp32

gcc/ChangeLog:

	PR sanitizer/95634
	* asan.c (asan_emit_stack_protection): Fix emission for ilp32
	by using Pmode instead of ptr_mode.

Co-Authored-By: Jakub Jelinek <jakub@redhat.com>
(cherry picked from commit 8cff672cb9a132d3d3158c2edfc9a64b55292b80)
---

diff --git a/gcc/asan.c b/gcc/asan.c
index fdbdb6ae15ac..2baf06ffa7c4 100644
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -1612,6 +1612,7 @@ asan_emit_stack_protection (rtx base, rtx pbase, unsigned int alignb,
 	  mem = adjust_address (mem, ptr_mode, offset);
 	  rtx addr = gen_reg_rtx (ptr_mode);
 	  emit_move_insn (addr, mem);
+	  addr = convert_memory_address (Pmode, addr);
 	  mem = gen_rtx_MEM (QImode, addr);
 	  emit_move_insn (mem, const0_rtx);
 	}