fix merge with upstream kernel attribute refactor#18868

sarnex merged 3 commits intointel:sycl-webintel/llvm:sycl-webfrom

sarnex:mergefixsarnex/llvm:mergefixCopy head branch name to clipboard