diff options
| author | Devang Patel <dpatel@apple.com> | 2002-08-20 18:01:14 -0700 |
|---|---|---|
| committer | Devang Patel <dpatel@gcc.gnu.org> | 2002-08-20 18:01:14 -0700 |
| commit | 92b5aacd3300c2154c62528c6a8914a749c7a663 (patch) | |
| tree | 487ede87395d20bb36a115837b7d1c9b31422c63 /gcc | |
| parent | a5aa74218fa95fb01fce7d4129f66912056c628d (diff) | |
| download | gcc-92b5aacd3300c2154c62528c6a8914a749c7a663.zip gcc-92b5aacd3300c2154c62528c6a8914a749c7a663.tar.gz gcc-92b5aacd3300c2154c62528c6a8914a749c7a663.tar.bz2 | |
tree.c (get_qualified_type): Add TYPE_CONTEXT check.
2002-08-20 Devang Patel <dpatel@apple.com>
* tree.c (get_qualified_type): Add TYPE_CONTEXT check.
testsuite:
* objc.dg/proto-hier-2.m: New test.
From-SVN: r56475
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/objc.dg/proto-hier-2.m | 49 | ||||
| -rw-r--r-- | gcc/tree.c | 3 |
4 files changed, 57 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 62df30a..00e4f42 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,6 @@ +2002-08-20 Devang Patel <dpatel@apple.com> + * tree.c (get_qualified_type): Add TYPE_CONTEXT check. + 2002-08-20 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * arc.c (output_shift): Use stdio instead of asm_fprintf. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 775dcb0..b682ab1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,6 @@ +2002-08-20 Devang Patel <dpatel@apple.com> + * objc.dg/proto-hier-2.m: New test. + 2002-08-19 Ziemowit Laski <zlaski@apple.com> * objc.dg/bitfield-1.m: New test. diff --git a/gcc/testsuite/objc.dg/proto-hier-2.m b/gcc/testsuite/objc.dg/proto-hier-2.m new file mode 100644 index 0000000..453de89 --- /dev/null +++ b/gcc/testsuite/objc.dg/proto-hier-2.m @@ -0,0 +1,49 @@ +/* Test protocol warning. */ +/* Contributed by Devang Patel <dpatel@apple.com>. */ +/* { dg-do compile } */ + +typedef struct objc_object { struct objc_class *class_pointer; } *id; + +@protocol Bar +@end + +id <Bar> Foo_Bar () { } + +typedef struct +{ + int i; +} MyStruct; + +@interface Foo +{ + id _mainData; + MyStruct *_anotherData; +} + +-(id) mainDataSource; +-(id) anotherDataSource; +-(id) my_method: (int) i; +@end + +@implementation Foo +-(id) anotherDataSource +{ + return (id)_anotherData; +} + +-(id) mainDataSource +{ + return _mainData; +} + +-(id) my_method: (int) i +{ + id one = [self anotherDataSource]; + + i = i - 1; + // Do not issue warning about my_method not implemented by protocol + return [(one ? [self mainDataSource] : one) my_method:i]; +} + +@end + @@ -2832,7 +2832,8 @@ get_qualified_type (type, type_quals) like the one we need to have. If so, use that existing one. We must preserve the TYPE_NAME, since there is code that depends on this. */ for (t = TYPE_MAIN_VARIANT (type); t; t = TYPE_NEXT_VARIANT (t)) - if (TYPE_QUALS (t) == type_quals && TYPE_NAME (t) == TYPE_NAME (type)) + if (TYPE_QUALS (t) == type_quals && TYPE_NAME (t) == TYPE_NAME (type) + && TYPE_CONTEXT (t) == TYPE_CONTEXT (type)) return t; return NULL_TREE; |