From df81b0bb951441d9069b5c1621ccd7e0fb46dc06 Mon Sep 17 00:00:00 2001 From: Thurston Dang Date: Tue, 7 Oct 2025 19:24:55 -0700 Subject: [PATCH] Revert "[Clang][CodeGen] Introduce the AllocToken SanitizerKind (#162098)" This reverts commit 0cee4db636ae802e6d2ecf2e53c4538f3354736e. --- clang/include/clang/Basic/Sanitizers.def | 3 --- clang/lib/CodeGen/CodeGenFunction.cpp | 2 -- 2 files changed, 5 deletions(-) diff --git a/clang/include/clang/Basic/Sanitizers.def b/clang/include/clang/Basic/Sanitizers.def index da85431625026..1d0e97cc7fb4c 100644 --- 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 index acf8de4dee147..b2fe9171372d8 100644 --- 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);