diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2006-03-02 17:45:30 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@gcc.gnu.org> | 2006-03-02 17:45:30 +0000 |
| commit | d349339d334659de743cd6435b068237369226e4 (patch) | |
| tree | 7b41557e4343556c0a977c36d08811644aeff119 /gcc/objc | |
| parent | 21a8ffa15869feadc72ea700ba33bee99554834d (diff) | |
| download | gcc-d349339d334659de743cd6435b068237369226e4.zip gcc-d349339d334659de743cd6435b068237369226e4.tar.gz gcc-d349339d334659de743cd6435b068237369226e4.tar.bz2 | |
Fixed a couple of objctective-c bugs.
Oked by Mike Stump.
From-SVN: r111642
Diffstat (limited to 'gcc/objc')
| -rw-r--r-- | gcc/objc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/objc/objc-act.c | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 321fe2e..67ccd3b 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,9 @@ +2006-03-02 Fariborz Jahanian <fjahanian@apple.com> + + * objc-act.c (init_module_descriptor): Remove file name from + module descriptor. + (gen_type_name_0): Fix ICE when issuing warning. + 2006-02-20 Rafael Ávila de Espíndola <rafael.espindola@gmail.com> * Make-lang.in (OBJC): Remove (OBJECTIVE-C): Remove diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index 463ceed..a90c061 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -2254,9 +2254,10 @@ init_module_descriptor (tree type) size_in_bytes (objc_module_template)); initlist = tree_cons (NULL_TREE, expr, initlist); - /* name = { ..., "foo.m", ... } */ + /* Don't provide any file name for security reasons. */ + /* name = { ..., "", ... } */ - expr = add_objc_string (get_identifier (input_filename), class_names); + expr = add_objc_string (get_identifier (""), class_names); initlist = tree_cons (NULL_TREE, expr, initlist); /* symtab = { ..., _OBJC_SYMBOLS, ... } */ @@ -8883,7 +8884,9 @@ gen_type_name_0 (tree type) if (TREE_CODE (type) == TYPE_DECL && DECL_NAME (type)) type = DECL_NAME (type); - strcat (errbuf, IDENTIFIER_POINTER (type)); + strcat (errbuf, TREE_CODE (type) == IDENTIFIER_NODE + ? IDENTIFIER_POINTER (type) + : ""); /* For 'id' and 'Class', adopted protocols are stored in the pointee. */ if (objc_is_id (orig)) |