wip

Author: AllanZyne

clang/lib/Driver/OffloadBundler.cpp

@@ -691,7 +691,7 @@ class ObjectFileHandler final : public FileHandler {
         // llvm.used and llvm.compiler.used to the list of defined symbols.
         if (SF->isIR() &&
             (Name == "llvm.used" || Name == "llvm.compiler.used" ||
-             Name == "__AsanSpirKernelMetadata"))
+             Name == "__AsanKernelMetadata"))
           continue;
 
         // Add symbol name with the target prefix to the buffer.

clang/lib/Driver/SanitizerArgs.cpp

@@ -1197,6 +1197,9 @@ void SanitizerArgs::addArgs(const ToolChain &TC, const llvm::opt::ArgList &Args,
 
       CmdArgs.push_back("-mllvm");
       CmdArgs.push_back("-asan-mapping-scale=4");
+
+      addSpecialCaseListOpt(Args, CmdArgs,
+                            "-fsanitize-ignorelist=", UserIgnorelistFiles);
     }
     return;
   }

llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp

@@ -1820,7 +1820,9 @@ void AddressSanitizer::instrumentInitAsanLaunchInfo(Function &F) {
       return;
     }
   }
-  IRB.CreateStore(ConstantInt::get(IntptrTy, 0), AsanLaunchInfo);
+  IRB.CreateStore(
+      ConstantPointerNull::get(IntptrTy->getPointerTo(kSpirOffloadGlobalAS)),
+      AsanLaunchInfo);
 }
 
 // Instrument memset/memmove/memcpy