From: Iain Sandoe <iains@gcc.gnu.org>
Date: Sat, 29 Oct 2011 12:59:30 +0000 (+0000)
Subject: re PR target/47997 (gcc on macosx: "ld: warning: -fwritable-strings not compatible... 
X-Git-Tag: releases/gcc-4.7.0~2716
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f439d6bad9ee840bf7e63e0f7a74440679bb50e0;p=thirdparty%2Fgcc.git

re PR target/47997 (gcc on macosx: "ld: warning: -fwritable-strings not compatible with literal CF/NSString")


gcc/objc:

	PR target/47997
	* objc-act.c (objc_build_string_object): Remove redundant second
	call to fix_string_type ().  Add a checking assert that we are,
	indeed, passed a STRING_CST.

From-SVN: r180653
---

diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 6e32f5f4b8a0..26b98983ea1f 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-29  Iain Sandoe  <iains@gcc.gnu.org>
+
+	PR target/47997
+	* objc-act.c (objc_build_string_object): Remove redundant second
+	call to fix_string_type ().  Add a checking assert that we are,
+	indeed, passed a STRING_CST.
+
 2011-10-18  Mikael Pettersson  <mikpe@it.uu.se>
 
 	PR objc/50743
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 9690113862e6..4a024f419a7b 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -3128,9 +3128,8 @@ objc_build_string_object (tree string)
   struct string_descriptor *desc, key;
   void **loc;
 
-  /* Prep the string argument.  */
-  string = fix_string_type (string);
-  TREE_SET_CODE (string, STRING_CST);
+  /* We should be passed a STRING_CST.  */
+  gcc_checking_assert (TREE_CODE (string) == STRING_CST);
   length = TREE_STRING_LENGTH (string) - 1;
 
   /* The target may have different ideas on how to construct an ObjC string