CFStrings for Darwin

gcc/testsuite:
	Based on the CFString implementation in FSF apple/trunk branch.
	
	* lib/objc-dg.exp (objc-dg-runtest): Merge flags and additional flags
	so that the latter can be used in dg-skip and dg-xfail clauses.
	* lib/obj-c++-dg.exp (obj-c++-dg-runtest): Likewise.
	* obj-c++.dg/template-4.mm: Don't use CFStrings on Darwin. Update test
	to use dg-additional-files for Object1.
	* obj-c++.dg/const-str-7.mm: Don't use CFStrings on Darwin. Update test
	to use dg-additional-files for Object1, move to torture/strings/.
	* obj-c++.dg/const-str-4.mm: Likewise.
	* obj-c++.dg/const-str-3.mm: Likewise.
	* obj-c++.dg/const-str-8.mm: Likewise.
	* obj-c++.dg/const-str-9.mm: Likewise.
	* obj-c++.dg/const-str-10.mm: Likewise.
	* obj-c++.dg/const-str-10.mm: Likewise.
	* obj-c++.dg/const-str-1.mm: Don't use CFStrings on Darwin. Update test
	to use dg-additional-files for Object1, move to strings/.
	* obj-c++.dg/const-str-2.mm: Likewise.
	* obj-c++.dg/const-str-5.mm: Likewise.
	* obj-c++.dg/const-str-6.mm: Likewise.
	* obj-c++.dg/const-str-12.mm: Likewise.
	* obj-c++.dg/strings/strings.exp: New.
	* obj-c++.dg/strings/const-cfstring-2.mm: New.
	* obj-c++.dg/strings/const-cfstring-5.mm: New.
	* obj-c++.dg/torture/strings/strings.exp: New.
	* obj-c++.dg/torture/strings/string1.mm: New.
	* obj-c++.dg/torture/strings/const-cfstring-1.mm: New.
	* obj-c++.dg/torture/strings/const-cfstring-3.mm: New.
	* obj-c++.dg/torture/strings/const-cfstring-4.mm: New.
	
	* objc/execute/string1.m: Don't use CFStrings on Darwin. Update test
	to use dg-additional-files for Object1, move to objc.dg/torture/strings/.
	* objc/execute/string2.m: Likewise.
	* objc/execute/string3.m: Likewise.
	* objc/execute/string3.m: Likewise.
	* objc.dg/foreach-2.m: Don't use CFStrings on Darwin.
	* objc.dg/foreach-4.m: Likewise.
	* objc.dg/foreach-5.m: Likewise.
	* objc.dg/const-str-3.m: Don't use CFStrings on Darwin. Update test
	to use dg-additional-files for Object1, move to objc.dg/torture/strings/.
	* objc.dg/const-str-4.m: Likewise.
	* objc.dg/const-str-7.m: Likewise.
	* objc.dg/const-str-8.m: Likewise.
	* objc.dg/const-str-9.m: Likewise.
	* objc.dg/const-str-10.m: Likewise.
	* objc.dg/const-str-11.m: Likewise.
	* objc.dg/const-str-1.m: Don't use CFStrings on Darwin. Update test
	to use dg-additional-files for Object1, move to objc.dg/strings/.
	* objc.dg/const-str-2.m: Likewise.
	* objc.dg/const-str-5.m: Likewise.
	* objc.dg/const-str-6.m: Likewise.
	* objc.dg/const-str-12.m: Likewise.
	* objc.dg/const-str-12b.m: Likewise.
	* objc.dg/strings/strings.exp: New.
	* objc.dg/strings/const-cfstring-2.m: New.
	* objc.dg/strings/const-cfstring-5.m: New.
	* objc.dg/torture/strings/strings.exp: New.
	* objc.dg/torture/strings/const-cfstring-1.m: New.
	* objc.dg/torture/strings/const-cfstring-3.m: New.
	* objc.dg/torture/strings/const-cfstring-4.m: New.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@165821 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 43 insertions, 0 deletions

diff --git a/gcc/testsuite/objc.dg/torture/strings/const-str-8.m b/gcc/testsuite/objc.dg/torture/strings/const-str-8.m
new file mode 100644
index 00000000000..c5bacaf437f
--- /dev/null
+++ b/gcc/testsuite/objc.dg/torture/strings/const-str-8.m
@@ -0,0 +1,43 @@
+/* Test for assigning compile-time constant-string objects to static variables.  */
+/* Contributed by Ziemowit Laski <zlaski@apple.com>  */
+/* { dg-do run } */
+/* { dg-options "-fconstant-string-class=Foo" } */
+/* { dg-options "-mno-constant-cfstrings -fconstant-string-class=Foo" { target *-*-darwin* } } */
+/* { dg-additional-sources "../../../objc-obj-c++-shared/Object1.m" } */
+
+#include "../../../objc-obj-c++-shared/Object1.h"
+#include <stdlib.h>
+
+@interface Foo: Object {
+  char *cString;
+  unsigned int len;
+}
+@end
+
+#ifdef NEXT_OBJC_USE_NEW_INTERFACE
+Class _FooClassReference;
+#else
+struct objc_class _FooClassReference;
+#endif
+
+@implementation Foo : Object
+- (char *)customString {
+  return cString;
+}
+@end
+
+static const Foo *appKey = @"MyApp";
+static int CFPreferencesSynchronize (const Foo *ref) {
+  return ref == appKey;
+}
+
+static void PrefsSynchronize(void)
+{
+  if(!CFPreferencesSynchronize(appKey))
+    abort();
+}
+
+int main () {
+  PrefsSynchronize();
+  return 0;
+}