===================================================================
@@ -1,3 +1,9 @@
+2010-12-23 Nicola Pero <nicola.pero@meta-innovation.com>
+
+ * obj-c.dg/gnu-api-2-class.m: Test that class_addMethod() returns
+ NO if the method is already implemented in the class.
+ * obj-c++.dg/gnu-api-2-class.mm: Same change.
+
2010-12-22 Sebastian Pop <sebastian.pop@amd.com>
PR tree-optimization/47019
===================================================================
@@ -140,6 +140,12 @@ int main(int argc, void **args)
method_getTypeEncoding (method2)))
abort ();
+ /* Test that if the method already exists in the class,
+ class_addMethod() returns NO. */
+ if (class_addMethod (new_class, @selector (variable), method_getImplementation (method2),
+ method_getTypeEncoding (method2)))
+ abort ();
+
objc_registerClassPair (new_class);
/* Now, MySubClass2 is basically the same as MySubClass! We'll
@@ -152,6 +158,15 @@ int main(int argc, void **args)
if ([o variable] != o)
abort ();
}
+
+ /* Now, try that if you take an existing class and try to add an
+ already existing method, class_addMethod returns NO. This is
+ subtly different from before, when 'new_class' was still in
+ construction. Now it's a real class and the libobjc internals
+ differ between the two cases. */
+ if (class_addMethod (new_class, @selector (variable), method_getImplementation (method2),
+ method_getTypeEncoding (method2)))
+ abort ();
}
printf ("Testing class_addProtocol ()...\n");
===================================================================
@@ -140,6 +140,12 @@ int main ()
method_getTypeEncoding (method2)))
abort ();
+ /* Test that if the method already exists in the class,
+ class_addMethod() returns NO. */
+ if (class_addMethod (new_class, @selector (variable), method_getImplementation (method2),
+ method_getTypeEncoding (method2)))
+ abort ();
+
objc_registerClassPair (new_class);
/* Now, MySubClass2 is basically the same as MySubClass! We'll
@@ -152,6 +158,15 @@ int main ()
if ([o variable] != o)
abort ();
}
+
+ /* Now, try that if you take an existing class and try to add an
+ already existing method, class_addMethod returns NO. This is
+ subtly different from before, when 'new_class' was still in
+ construction. Now it's a real class and the libobjc internals
+ differ between the two cases. */
+ if (class_addMethod (new_class, @selector (variable), method_getImplementation (method2),
+ method_getTypeEncoding (method2)))
+ abort ();
}
std::cout << "Testing class_addProtocol ()...\n";
===================================================================
@@ -759,6 +759,45 @@ class_addMethod (Class class_, SEL selector, IMP i
if (method_name == NULL)
return NO;
+ /* If the method already exists in the class, return NO. It is fine
+ if the method already exists in the superclass; in that case, we
+ are overriding it. */
+ if (CLS_IS_IN_CONSTRUCTION (class_))
+ {
+ /* The class only contains a list of methods; they have not been
+ registered yet, ie, the method_name of each of them is still
+ a string, not a selector. Iterate manually over them to
+ check if we have already added the method. */
+ struct objc_method_list * method_list = class_->methods;
+ while (method_list)
+ {
+ int i;
+
+ /* Search the method list. */
+ for (i = 0; i < method_list->method_count; ++i)
+ {
+ struct objc_method * method = &method_list->method_list[i];
+
+ if (method->method_name
+ && strcmp ((char *)method->method_name, method_name) == 0)
+ return NO;
+ }
+
+ /* The method wasn't found. Follow the link to the next list of
+ methods. */
+ method_list = method_list->method_next;
+ }
+ /* The method wasn't found. It's a new one. Go ahead and add
+ it. */
+ }
+ else
+ {
+ /* Do the standard lookup. This assumes the selectors are
+ mapped. */
+ if (search_for_method_in_list (class_->methods, selector))
+ return NO;
+ }
+
method_list = (struct objc_method_list *)objc_calloc (1, sizeof (struct objc_method_list));
method_list->method_count = 1;
===================================================================
@@ -1,3 +1,8 @@
+2010-12-23 Nicola Pero <nicola.pero@meta-innovation.com>
+
+ * sendmsg.c (class_addMethod): Return NO if the method already
+ exists in the class.
+
2010-12-22 Nicola Pero <nicola.pero@meta-innovation.com>
* init.c (duplicate_classes): New.