From ad2e5b71299d16f02eab3600e2ab28665d4aa363 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Thu, 10 Jan 2013 13:58:51 +0000
Subject: [PATCH] builtins.c (expand_builtin_init_trampoline): Use
 set_mem_attributes.

2013-01-10  Richard Biener  <rguenther@suse.de>

	* builtins.c (expand_builtin_init_trampoline): Use
	set_mem_attributes.

From-SVN: r195086
---
 gcc/ChangeLog  | 5 +++++
 gcc/builtins.c | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 42f1bd862d8b..fc79821d8722 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-10  Richard Biener  <rguenther@suse.de>
+
+	* builtins.c (expand_builtin_init_trampoline): Use
+	set_mem_attributes.
+
 2013-01-10  Richard Biener  <rguenther@suse.de>
 
 	PR bootstrap/55792
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 2b615a17c100..8ae4988418a0 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -4853,8 +4853,7 @@ expand_builtin_init_trampoline (tree exp, bool onstack)
      within the local function's FRAME decl.  Either way, let's see if
      we can fill in the MEM_ATTRs for this memory.  */
   if (TREE_CODE (t_tramp) == ADDR_EXPR)
-    set_mem_attributes_minus_bitpos (m_tramp, TREE_OPERAND (t_tramp, 0),
-				     true, 0);
+    set_mem_attributes (m_tramp, TREE_OPERAND (t_tramp, 0), true);
 
   /* Creator of a heap trampoline is responsible for making sure the
      address is aligned to at least STACK_BOUNDARY.  Normally malloc
-- 
GitLab