From eedf95c74854ac83bf596068e0e448c41629a622 Mon Sep 17 00:00:00 2001
From: idubinov <igor.dubinov@intel.com>
Date: Tue, 6 Aug 2019 14:30:31 +0300
Subject: [PATCH] [SYCL] Add template template parameter support

Signed-off-by: idubinov <igor.dubinov@intel.com>
---
 clang/lib/Sema/SemaSYCL.cpp                   | 24 ++++++-
 .../template-template-parameter.cpp           | 72 +++++++++++++++++++
 2 files changed, 94 insertions(+), 2 deletions(-)
 create mode 100644 clang/test/CodeGenSYCL/template-template-parameter.cpp

diff --git a/clang/lib/Sema/SemaSYCL.cpp b/clang/lib/Sema/SemaSYCL.cpp
index f2c22a52ef574..c82a2beb1e1c9 100755
--- a/clang/lib/Sema/SemaSYCL.cpp
+++ b/clang/lib/Sema/SemaSYCL.cpp
@@ -1382,8 +1382,28 @@ void SYCLIntegrationHeader::emitForwardClassDecls(
         }
         break;
       }
-      case TemplateArgument::ArgKind::Template:
-        llvm_unreachable("template template arguments not supported");
+      case TemplateArgument::ArgKind::Template: {
+        // recursion is not required, since the maximum possible nesting level
+        // equals two for template argument
+        //
+        // for example:
+        //   template <typename T> class Bar;
+        //   template <template <typename> class> class Baz;
+        //   template <template <template <typename> class> class T> 
+        //   class Foo;
+        //
+        // The Baz is a template class. The Baz<Bar> is a class. The class Foo
+        // should be specialized with template class, not a class. The correct
+        // specialization of template class Foo is Foo<Baz>. The incorrect 
+        // specialization of template class Foo is Foo<Baz<Bar>>. In this case
+        // template class Foo specialized by class Baz<Bar>, not a template 
+        // class template <template <typename> class> class T as it should.
+        TemplateDecl *TD = Arg.getAsTemplate().getAsTemplateDecl();
+        if (Printed.insert(TD).second) {
+          emitFwdDecl(O, TD);
+        }
+        break;
+      }
       default:
         break; // nop
       }
diff --git a/clang/test/CodeGenSYCL/template-template-parameter.cpp b/clang/test/CodeGenSYCL/template-template-parameter.cpp
new file mode 100644
index 0000000000000..7ef01de040d84
--- /dev/null
+++ b/clang/test/CodeGenSYCL/template-template-parameter.cpp
@@ -0,0 +1,72 @@
+// RUN: %clang -I %S/Inputs --sycl -Xclang -fsycl-int-header=%t.h %s
+// RUN: FileCheck -input-file=%t.h %s
+
+#include <sycl.hpp>
+
+using namespace cl::sycl;
+
+template <typename T> class Foo1;
+// CHECK: template <typename T> class Foo1;
+template <template <typename> class TT> class KernelName1;
+// CHECK: template <template <typename> class TT> class KernelName1;
+template <template <typename> class TT> void enqueue() {
+  queue q;
+  q.submit([&](handler &cgh) {
+    cgh.single_task<KernelName1<TT>>([](){});
+  });
+}
+
+template <typename TY> class Bar2;
+// CHECK: template <typename TY> class Bar2;
+template <template <typename> class TT> class Foo2;
+// CHECK: template <template <typename> class TT> class Foo2;
+template <class TTY> class KernelName2;
+// CHECK: template <class TTY> class KernelName2;
+template <class Y> void enqueue2() {
+  queue q;
+  q.submit([&](handler &cgh) {
+    cgh.single_task< KernelName2<Y> >([](){});
+  });
+}
+
+template <typename T> class Bar3;
+// CHECK: template <typename T> class Bar3;
+template <template <typename> class> class Baz3;
+// CHECK: template <template <typename> class > class Baz3;
+template <template <template <typename> class> class T> class Foo3;
+// CHECK: template <template <template <typename> class > class T> class Foo3;
+template <typename T , typename... Args> class Mist3;
+// CHECK: template <typename T, typename ...Args> class Mist3;
+template <typename T, template <typename, typename...> class, typename... Args> class Ice3;
+// CHECK: template <typename T, template <typename, typename ...> class , typename ...Args> class Ice3;
+
+int main() {
+  enqueue<Foo1>();
+
+  enqueue2<Foo2<Bar2>>();
+  
+  queue q;
+
+  q.submit([&](handler &cgh) {
+    cgh.single_task<Bar3<int>>([](){});
+  });
+
+  q.submit([&](handler &cgh) {
+    cgh.single_task<Baz3<Bar3>>([](){});
+  });
+
+  q.submit([&](handler &cgh) {
+    cgh.single_task<Foo3<Baz3>>([](){});
+  });
+
+  q.submit([&](handler &cgh) {
+    cgh.single_task<Mist3<int, float, char, double>>([](){});
+  });
+
+  q.submit([&](handler &cgh) {
+    cgh.single_task<Ice3<int, Mist3, char, short, float>>([](){});
+  });
+
+  return 0;
+}
+