diff --git a/gcc/asan.c b/gcc/asan.c
index e015fa3ec9b..9c9aa4cae35 100644
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -1613,6 +1613,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);
 	}