@@ -1379,7 +1379,7 @@ static void ExtendSpirKernelArgs(Module &M, FunctionAnalysisManager &FAM,
1379
1379
}
1380
1380
1381
1381
// New argument: uintptr_t as(1)*, which is allocated in shared USM buffer
1382
- Types.push_back (IntptrTy-> getPointerTo ( kSpirOffloadGlobalAS ));
1382
+ Types.push_back (llvm::PointerType::get (IntptrTy, kSpirOffloadGlobalAS ));
1383
1383
1384
1384
FunctionType *NewFTy = FunctionType::get (F->getReturnType (), Types, false );
1385
1385
@@ -1704,7 +1704,7 @@ void AddressSanitizer::AppendDebugInfoToArgs(Instruction *InsertBefore,
1704
1704
1705
1705
// SPIR constant address space
1706
1706
PointerType *ConstASPtrTy =
1707
- Type::getInt8Ty (C)-> getPointerTo ( kSpirOffloadConstantAS );
1707
+ llvm::PointerType::get ( Type::getInt8Ty (C), kSpirOffloadConstantAS );
1708
1708
1709
1709
// File & Line
1710
1710
if (Loc) {
@@ -1863,9 +1863,9 @@ void AddressSanitizer::instrumentInitAsanLaunchInfo(
1863
1863
// FIXME: if the initial value of "__AsanLaunchInfo" is zero, we'll not need
1864
1864
// this step
1865
1865
initializeCallbacks (TLI);
1866
- IRB.CreateStore (
1867
- ConstantPointerNull:: get (IntptrTy-> getPointerTo ( kSpirOffloadGlobalAS )),
1868
- AsanLaunchInfo);
1866
+ IRB.CreateStore (ConstantPointerNull::get (
1867
+ llvm::PointerType:: get (IntptrTy, kSpirOffloadGlobalAS )),
1868
+ AsanLaunchInfo);
1869
1869
}
1870
1870
1871
1871
// Instrument memset/memmove/memcpy
@@ -3457,7 +3457,7 @@ void AddressSanitizer::initializeCallbacks(const TargetLibraryInfo *TLI) {
3457
3457
// )
3458
3458
if (TargetTriple.isSPIROrSPIRV ()) {
3459
3459
auto *Int8PtrTy =
3460
- Type::getInt8Ty (*C)-> getPointerTo ( kSpirOffloadConstantAS );
3460
+ llvm::PointerType::get ( Type::getInt8Ty (*C), kSpirOffloadConstantAS );
3461
3461
3462
3462
Args1.push_back (Int8PtrTy); // file
3463
3463
Args1.push_back (Type::getInt32Ty (*C)); // line
@@ -3574,9 +3574,10 @@ void AddressSanitizer::initializeCallbacks(const TargetLibraryInfo *TLI) {
3574
3574
IRB.getVoidTy (), IntptrTy, Int32Ty);
3575
3575
3576
3576
AsanLaunchInfo = M.getOrInsertGlobal (
3577
- " __AsanLaunchInfo" , IntptrTy->getPointerTo (kSpirOffloadGlobalAS ), [&] {
3577
+ " __AsanLaunchInfo" ,
3578
+ llvm::PointerType::get (IntptrTy, kSpirOffloadGlobalAS ), [&] {
3578
3579
return new GlobalVariable (
3579
- M, IntptrTy-> getPointerTo ( kSpirOffloadGlobalAS ), false ,
3580
+ M, llvm::PointerType::get (IntptrTy, kSpirOffloadGlobalAS ), false ,
3580
3581
GlobalVariable::ExternalLinkage, nullptr , " __AsanLaunchInfo" ,
3581
3582
nullptr , GlobalVariable::NotThreadLocal, kSpirOffloadLocalAS );
3582
3583
});
0 commit comments