From a75fa8aaf2005c6cb7561a9aa5129a38075939a4 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 24 Aug 2017 16:35:14 +0000
Subject: Vendor import of clang release_50 branch r311606:
 https://llvm.org/svn/llvm-project/cfe/branches/release_50@311606

---
 lib/Lex/Preprocessor.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/Lex/Preprocessor.cpp')

diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index d1dc8e1c00105..7979be773aa13 100644
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -540,6 +540,8 @@ void Preprocessor::EnterMainSourceFile() {
 void Preprocessor::replayPreambleConditionalStack() {
   // Restore the conditional stack from the preamble, if there is one.
   if (PreambleConditionalStack.isReplaying()) {
+    assert(CurPPLexer &&
+           "CurPPLexer is null when calling replayPreambleConditionalStack.");
     CurPPLexer->setConditionalLevels(PreambleConditionalStack.getStack());
     PreambleConditionalStack.doneReplaying();
   }
-- 
cgit v1.2.3