!ApplyTrapDI assertion

Author: thurstond

clang/lib/CodeGen/CodeGenFunction.cpp

@@ -2759,6 +2759,7 @@ CodeGenFunction::SanitizerScope::SanitizerScope(
   assert(!CGF->IsSanitizerScope);
   CGF->IsSanitizerScope = true;
 
+  assert(!this->ApplyTrapDI);
   this->ApplyTrapDI =
       new ApplyDebugLocation(*CGF, CGF->SanitizerAnnotateDebugInfo(Ordinals));
 }
@@ -2767,6 +2768,7 @@ CodeGenFunction::SanitizerScope::~SanitizerScope() {
   CGF->IsSanitizerScope = false;
 
   delete ((ApplyDebugLocation *)this->ApplyTrapDI);
+  this->ApplyTrapDI = nullptr;
 }
 
 void CodeGenFunction::InsertHelper(llvm::Instruction *I,

clang/lib/CodeGen/CodeGenFunction.h

@@ -599,7 +599,7 @@ class CodeGenFunction : public CodeGenTypeCache {
 
     // ApplyDebugLocation is undeclared: CGDebugInfo.h is not #included in this
     // header due to overhead (b384d6d6ccc8f4452cd7086061c657ce76b41224)
-    void *ApplyTrapDI;
+    void *ApplyTrapDI = nullptr;
 
   public:
     SanitizerScope(CodeGenFunction *CGF,