aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2006-04-01 00:30:17 +0000
committerFariborz Jahanian <fjahanian@apple.com>2006-04-01 00:30:17 +0000
commit2277fdeda58e3ba27ecfd294527e6b54cfaa9c6f (patch)
treedbf655286a872bbc7a5f357969d6097f5f97d97b
parent4fe2412e1a2289e991dc2bd4d0f91c6103020cd9 (diff)
Radar 4494634 (revised).
OKed by Mike. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/apple/trunk@112602 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/objc/ChangeLog.apple-ppc5
-rw-r--r--gcc/objc/objc-act.c14
2 files changed, 6 insertions, 13 deletions
diff --git a/gcc/objc/ChangeLog.apple-ppc b/gcc/objc/ChangeLog.apple-ppc
index 610cc951c01..1f50decbc12 100644
--- a/gcc/objc/ChangeLog.apple-ppc
+++ b/gcc/objc/ChangeLog.apple-ppc
@@ -1,6 +1,11 @@
2006-03-31 Fariborz Jahanian <fjahanian@apple.com>
Radar 4494634
+ * objc-act.c (objc_build_string_object): Call build1 directly.
+
+2006-03-31 Fariborz Jahanian <fjahanian@apple.com>
+
+ Radar 4494634
* objc-act.c (objc_build_string_object): Suppress strict-alias
warning when converting to type 'id'.
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 78a6d9562b9..aae88c23d46 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -2862,19 +2862,7 @@ objc_build_string_object (tree string)
constructor = (*targetm.construct_objc_string) (string);
/* APPLE LOCAL begin radar 4494634 */
if (constructor)
- {
- /* We must type-cast 'struct __builtin_CFString*' to type of a CFString which
- is an object of type 'id'. This however, results in the -fstrict-aliasing
- warning. Object of type 'struct __builtin_CFString' is a read-only object
- and its fields are not user-referenced (neither is the sole field in the 'id'
- object). So, it is safe to turn-off the warning for this case. */
- tree string_object_tree;
- int save_warn_strict_aliasing = warn_strict_aliasing;
- warn_strict_aliasing = 0;
- string_object_tree = build_c_cast (objc_object_type, constructor);
- warn_strict_aliasing = save_warn_strict_aliasing;
- return string_object_tree;
- }
+ return build1 (NOP_EXPR, objc_object_type, constructor);
/* APPLE LOCAL end radar 4494634 */
/* APPLE LOCAL end constant cfstrings */