commit 42ab39f1e8fb4a6c30c77988ed01e0cc663d1e00
author Adrian Prantl <aprantl@apple.com> Fri Nov 09 21:17:38 2018 +0000
committer Adrian Prantl <aprantl@apple.com> Fri Nov 09 21:17:38 2018 +0000
tree d6b624148dee7a5ba2c80788cec219c0cef83d30
parent ef67ce0f6f979085271d6402dcb38bf90f878c65

Revert "Revert rL346454: Fix a use-after-free introduced by r344915."

This un-reverts commit 346454 with a relaxed CHECK for Windows.

llvm-svn: 346556

clang/lib/CodeGen/CGDebugInfo.cpp

diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index 1d999e4..81cc07d 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -3538,7 +3538,7 @@
   // Update our current location
   setLocation(Loc);
 
-  if (CurLoc.isInvalid() || CurLoc.isMacroID())
+  if (CurLoc.isInvalid() || CurLoc.isMacroID() || LexicalBlockStack.empty())
     return;
 
   llvm::MDNode *Scope = LexicalBlockStack.back();