obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 81 insertions, 0 deletions

diff --git a/gcc/testsuite/obj-c++.dg/template-3.mm b/gcc/testsuite/obj-c++.dg/template-3.mm
new file mode 100644
index 000000000..a3b96b32d
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/template-3.mm
@@ -0,0 +1,81 @@
+/* Test for passing arguments to ObjC methods in the context of template
+   expansion.  */
+/* Contributed by Ziemowit Laski  <zlaski@apple.com>.  */
+
+/* { dg-do run } */
+/* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */
+#include "../objc-obj-c++-shared/Object1.h"
+#include <stdlib.h>
+
+#define CHECK_IF(expr) if(!(expr)) abort()
+
+@interface ObjCClass : Object
+{
+@public
+  int info;
+}
+-(id) init;
+-(id) initWithInformation: (int) whatInfo;
+-(id) initWithInformation: (int) whatInfo andInfo: (int) info2;
+@end
+
+void foo(int info) {
+   ObjCClass *mObj1 = [[ObjCClass alloc] init];
+   ObjCClass *mObj2 = [[ObjCClass alloc] initWithInformation: info];
+   ObjCClass *mObj3 = [[ObjCClass alloc] initWithInformation: info andInfo: 39];
+
+   CHECK_IF(mObj1->info == 666);
+   CHECK_IF(mObj2->info == info);
+   CHECK_IF(mObj3->info == info + 39);
+}
+
+template <class WrappedObjCClass>
+class ObjCObjectWrapper
+{
+    public:
+        ObjCObjectWrapper(int info);
+        WrappedObjCClass *mObj1, *mObj2, *mObj3;
+};
+
+template <class WrappedObjCClass>
+ObjCObjectWrapper<WrappedObjCClass>::ObjCObjectWrapper(int info)
+{
+    mObj1 = [[WrappedObjCClass alloc] init];
+    mObj2 = [[WrappedObjCClass alloc] initWithInformation: info];
+    mObj3 = [[WrappedObjCClass alloc] initWithInformation: info andInfo: 67];
+}
+
+@implementation ObjCClass
+-(id) init {
+  return [self initWithInformation:666];
+}
+-(id) initWithInformation: (int) whatInfo {
+  [super init];
+  info = whatInfo;
+  return self;
+}
+-(id) initWithInformation: (int) whatInfo andInfo: (int) info2 {
+  [super init];
+  info = whatInfo + info2;
+  return self;
+}
+@end
+
+ObjCObjectWrapper<ObjCClass> staticInstance(42); 
+
+int main(void) {
+  ObjCObjectWrapper<ObjCClass> stackInstance(47);
+
+  foo(89);
+  
+  CHECK_IF(staticInstance.mObj1->info == 666);
+  CHECK_IF(staticInstance.mObj2->info == 42);
+  CHECK_IF(staticInstance.mObj3->info == 42 + 67);
+  
+  CHECK_IF(stackInstance.mObj1->info == 666);
+  CHECK_IF(stackInstance.mObj2->info == 47);
+  CHECK_IF(stackInstance.mObj3->info == 47 + 67);
+  
+  return 0;
+}
+#include "../objc-obj-c++-shared/Object1-implementation.h"