[llvm] 700442d - [msan] Destroy ConstantTokenNone before types above

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2022-04-19T16:57:32-07:00
New Revision: 700442dee381f2149d4471608520418a7bfb0f96

URL: https://github.com/llvm/llvm-project/commit/700442dee381f2149d4471608520418a7bfb0f96
DIFF: https://github.com/llvm/llvm-project/commit/700442dee381f2149d4471608520418a7bfb0f96.diff

LOG: [msan] Destroy ConstantTokenNone before types above

~ConstantTokenNone access them, so it should be destroyed first.

Added: 
    

Modified: 
    llvm/lib/IR/LLVMContextImpl.h

Removed: 
    


################################################################################
diff  --git a/llvm/lib/IR/LLVMContextImpl.h b/llvm/lib/IR/LLVMContextImpl.h
index 2d07a26fd67a2..e6a6a61038808 100644
--- a/llvm/lib/IR/LLVMContextImpl.h
+++ b/llvm/lib/IR/LLVMContextImpl.h
@@ -1459,14 +1459,14 @@ class LLVMContextImpl {
   ConstantInt *TheTrueVal = nullptr;
   ConstantInt *TheFalseVal = nullptr;
 
-  std::unique_ptr<ConstantTokenNone> TheNoneToken;
-
   // Basic type instances.
   Type VoidTy, LabelTy, HalfTy, BFloatTy, FloatTy, DoubleTy, MetadataTy,
       TokenTy;
   Type X86_FP80Ty, FP128Ty, PPC_FP128Ty, X86_MMXTy, X86_AMXTy;
   IntegerType Int1Ty, Int8Ty, Int16Ty, Int32Ty, Int64Ty, Int128Ty;
 
+  std::unique_ptr<ConstantTokenNone> TheNoneToken;
+
   BumpPtrAllocator Alloc;
   UniqueStringSaver Saver{Alloc};