Revert "[Clang][CodeGen] Introduce the AllocToken SanitizerKind" (#162413)

thurstond · web-flow · commit c74fa20c955b · 2025-10-08T02:57:19.000Z
Reverts #162098 Reason: buildbot breakage (see #162098 (comment))
diff --git a/clang/include/clang/Basic/Sanitizers.def b/clang/include/clang/Basic/Sanitizers.def
@@ -195,9 +195,6 @@ SANITIZER_GROUP("bounds", Bounds, ArrayBounds | LocalBounds)
 // Scudo hardened allocator
 SANITIZER("scudo", Scudo)
 
-// AllocToken
-SANITIZER("alloc-token", AllocToken)
-
 // Magic group, containing all sanitizers. For example, "-fno-sanitize=all"
 // can be used to disable all the sanitizers.
 SANITIZER_GROUP("all", All, ~SanitizerMask())
diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp
@@ -846,8 +846,6 @@ void CodeGenFunction::StartFunction(GlobalDecl GD, QualType RetTy,
       Fn->addFnAttr(llvm::Attribute::SanitizeNumericalStability);
     if (SanOpts.hasOneOf(SanitizerKind::Memory | SanitizerKind::KernelMemory))
       Fn->addFnAttr(llvm::Attribute::SanitizeMemory);
-    if (SanOpts.has(SanitizerKind::AllocToken))
-      Fn->addFnAttr(llvm::Attribute::SanitizeAllocToken);
   }
   if (SanOpts.has(SanitizerKind::SafeStack))
     Fn->addFnAttr(llvm::Attribute::SafeStack);

Original file line number	Diff line number	Diff line change
`@@ -846,8 +846,6 @@ void CodeGenFunction::StartFunction(GlobalDecl GD, QualType RetTy,`
`846`	`846`	`Fn->addFnAttr(llvm::Attribute::SanitizeNumericalStability);`
`847`	`847`	`if (SanOpts.hasOneOf(SanitizerKind::Memory \| SanitizerKind::KernelMemory))`
`848`	`848`	`Fn->addFnAttr(llvm::Attribute::SanitizeMemory);`
`849`		`- if (SanOpts.has(SanitizerKind::AllocToken))`
`850`		`- Fn->addFnAttr(llvm::Attribute::SanitizeAllocToken);`
`851`	`849`	`}`
`852`	`850`	`if (SanOpts.has(SanitizerKind::SafeStack))`
`853`	`851`	`Fn->addFnAttr(llvm::Attribute::SafeStack);`