[SYCLomatic] Fix the issue that explicit template instantiation type argument is not migrated in macro scenario (#2611)

intwanghao · web-flow · commit 6fab2bb704fa · 2025-01-13T09:15:45.000+08:00
Signed-off-by: intwanghao &lt;hao3.wang@intel.com&gt;
diff --git a/clang/lib/DPCT/RuleInfra/ExprAnalysis.h b/clang/lib/DPCT/RuleInfra/ExprAnalysis.h
@@ -221,7 +221,8 @@ class ExprAnalysis {
   }
 
   inline void analyze(const TemplateArgumentLoc &TAL) {
-    initSourceRange(TAL.getSourceRange());
+    auto SR = TAL.getSourceRange();
+    initSourceRange(getDefinitionRange(SR.getBegin(), SR.getEnd()));
     analyzeTemplateArgument(TAL);
   }
 
diff --git a/clang/test/dpct/macro_test.cu b/clang/test/dpct/macro_test.cu
@@ -1504,6 +1504,14 @@ void foo44(float *x, int size, int d3, int d2) {
   FROMDEV2(x)
 }
 
+template<typename T>
+void foo45(){}
+
+#define EXPLICIT_DECL(T) template void foo45<T>()
+
+// CHECK: extern EXPLICIT_DECL(sycl::half);
+extern EXPLICIT_DECL(half);
+
 #undef TODEV
 #undef FROMDEV
 #undef FREE

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,8 @@ class ExprAnalysis {`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`inline void analyze(const TemplateArgumentLoc &TAL) {`
`224`		`- initSourceRange(TAL.getSourceRange());`
	`224`	`+ auto SR = TAL.getSourceRange();`
	`225`	`+ initSourceRange(getDefinitionRange(SR.getBegin(), SR.getEnd()));`
`225`	`226`	`analyzeTemplateArgument(TAL);`
`226`	`227`	`}`
`227`	`228`