summaryrefslogtreecommitdiff
path: root/gcc/objc
diff options
context:
space:
mode:
authoriains <iains@138bc75d-0d04-0410-961f-82ee72b054a4>2011-10-29 12:59:30 +0000
committeriains <iains@138bc75d-0d04-0410-961f-82ee72b054a4>2011-10-29 12:59:30 +0000
commit8a8f7a54dc6cc5c1a493c8c777d17ec63b541bbf (patch)
treeab487a84eafeadabe8dc0e3ac445e9f030ce421d /gcc/objc
parent3b9a92b361e878b69fa55bd55fd7564bd70113b8 (diff)
downloadgcc-8a8f7a54dc6cc5c1a493c8c777d17ec63b541bbf.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@180653 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/objc')
-rw-r--r--gcc/objc/ChangeLog7
-rw-r--r--gcc/objc/objc-act.c5
2 files changed, 9 insertions, 3 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 6e32f5f4b8a..26b98983ea1 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 9690113862e..4a024f419a7 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