Skip to content

Commit 74bf18b

Browse files
wenju-hebader
authored andcommitted
[clang][SPIR][SPIRV] Don't generate constant NULL from addrspacecast generic NULL (#165353)
Fix a regression caused by 1ffff05. OpenCL/SPIRV generic address space doesn't cover constant address space. --------- Co-authored-by: Alexey Bader <alexey.bader@intel.com>
1 parent fd37071 commit 74bf18b

File tree

3 files changed

+737
-634
lines changed

3 files changed

+737
-634
lines changed

clang/lib/CodeGen/Targets/SPIR.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,8 @@ CommonSPIRTargetCodeGenInfo::getNullPointer(const CodeGen::CodeGenModule &CGM,
419419
LangAS AS = QT->getUnqualifiedDesugaredType()->isNullPtrType()
420420
? LangAS::Default
421421
: QT->getPointeeType().getAddressSpace();
422-
if (AS == LangAS::Default || AS == LangAS::opencl_generic)
422+
if (AS == LangAS::Default || AS == LangAS::opencl_generic ||
423+
AS == LangAS::opencl_constant)
423424
return llvm::ConstantPointerNull::get(PT);
424425

425426
auto &Ctx = CGM.getContext();

0 commit comments

Comments
 (0)