[pushed] testsuite, Objective-C : Compatibility fixes.

Message ID 8874B717-647E-44AF-AED5-A86C2060A750@sandoe.co.uk
State New
Headers show
Series
  • [pushed] testsuite, Objective-C : Compatibility fixes.
Related show

Commit Message

Iain Sandoe Oct. 11, 2020, 1:42 p.m.
Hi

Changes to deal with warnings and/or errors seen when compiling the
tests with clang (allowing us to compare a sub-set of the tests between
implementations).

tested across the Darwin range, and on x86_64-linux
pushed to master
thanks
Iain

gcc/testsuite/ChangeLog:

	* objc-obj-c++-shared/TestsuiteObject.h: If the compiler
	supports objc_root_object attributes, then mark the testsuite
	object accordingly.
	* objc-obj-c++-shared/TestsuiteObject.m: Avoid direct access
	to isa, which is an error for modern Objective-C.
	* objc/execute/class-tests-1.h: Declare a string function we
	use locally (avoid pulling in the whole of string.h).
---
 gcc/testsuite/objc-obj-c++-shared/TestsuiteObject.h | 3 +++
 gcc/testsuite/objc-obj-c++-shared/TestsuiteObject.m | 2 +-
 gcc/testsuite/objc/execute/class-tests-1.h          | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

-- 
2.24.1

Patch

diff --git a/gcc/testsuite/objc-obj-c++-shared/TestsuiteObject.h b/gcc/testsuite/objc-obj-c++-shared/TestsuiteObject.h
index 66b68c81ec9..0f139bc84b4 100644
--- a/gcc/testsuite/objc-obj-c++-shared/TestsuiteObject.h
+++ b/gcc/testsuite/objc-obj-c++-shared/TestsuiteObject.h
@@ -24,6 +24,9 @@  along with GCC; see the file COPYING3.  If not see
 /* We use this root class instead of Object to keep the tests
    independent of the runtime being used.  Keep it simple.  */
 
+#if defined(__has_attribute) && __has_attribute(objc_root_class)
+__attribute__((objc_root_class))
+#endif
 @interface TestsuiteObject
 {
   Class isa;
diff --git a/gcc/testsuite/objc-obj-c++-shared/TestsuiteObject.m b/gcc/testsuite/objc-obj-c++-shared/TestsuiteObject.m
index 6bbe7d470e8..703827f8e61 100644
--- a/gcc/testsuite/objc-obj-c++-shared/TestsuiteObject.m
+++ b/gcc/testsuite/objc-obj-c++-shared/TestsuiteObject.m
@@ -64,6 +64,6 @@  along with GCC; see the file COPYING3.  If not see
 }
 - (const char *)name
 {
-  return class_getName (isa);
+  return object_getClassName (self);
 }
 @end
diff --git a/gcc/testsuite/objc/execute/class-tests-1.h b/gcc/testsuite/objc/execute/class-tests-1.h
index cfdd72b4748..65f1f70234e 100644
--- a/gcc/testsuite/objc/execute/class-tests-1.h
+++ b/gcc/testsuite/objc/execute/class-tests-1.h
@@ -4,6 +4,8 @@ 
 #include <stdlib.h>
 #include "../../objc-obj-c++-shared/runtime.h"
 
+extern int strcmp(const char *, const char *);
+
 /*
  * Standard Tests For Classes and Objects - abort upon failing; return
  * normally if all is well.