From ed6ed023fc5e120687166c1ded8487cbff6dac8a Mon Sep 17 00:00:00 2001 From: Luc Forget Date: Fri, 22 Oct 2021 03:19:54 -0700 Subject: [PATCH] Fix ignored -fsycl-unnamed-lambda (#145) --- clang/lib/Frontend/CompilerInvocation.cpp | 1 - clang/lib/Sema/SemaSYCL.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index d3eb582ac087..868f48886d36 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -3976,7 +3976,6 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args, options::OPT_fno_sycl_allow_variadic_func) : Args.hasFlag(options::OPT_fsycl_allow_variadic_func, options::OPT_fno_sycl_allow_variadic_func, false); - Opts.SYCLUnnamedLambda = Args.hasArg(options::OPT_fsycl_unnamed_lambda); // Get OpenMP host file path if any and report if a non existent file is // found diff --git a/clang/lib/Sema/SemaSYCL.cpp b/clang/lib/Sema/SemaSYCL.cpp index d4d87713e6c6..2bb50c2885b3 100755 --- a/clang/lib/Sema/SemaSYCL.cpp +++ b/clang/lib/Sema/SemaSYCL.cpp @@ -1093,7 +1093,7 @@ constructKernelName(Sema &S, const FunctionDecl *KernelCallerFunc, std::string Str = SYCLUniqueStableNameExpr::ComputeName(S.getASTContext(), KernelNameType); Res = computeUniqueSYCLVXXName(Res, KernelNameType.getAsString()); - return {Res, Str}; + return {Res, computeUniqueSYCLVXXName(Str, Str)}; } static bool isDefaultSPIRArch(ASTContext &Context) {