From a2d2fd8167c17aec3a9711916d4f5c7a031cd769 Mon Sep 17 00:00:00 2001
From: Fangrui Song <i@maskray.me>
Date: Sat, 26 Dec 2020 12:31:19 -0800
Subject: [PATCH] diagnosticMain: Rebuild preamble for bounds change

---
 src/sema_manager.cc | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/sema_manager.cc b/src/sema_manager.cc
index 02a8647d..f597395c 100644
--- a/src/sema_manager.cc
+++ b/src/sema_manager.cc
@@ -556,6 +556,10 @@ void *diagnosticMain(void *manager_) {
     std::shared_ptr<PreambleData> preamble = session->getPreamble();
     IntrusiveRefCntPtr<llvm::vfs::FileSystem> fs =
         preamble ? preamble->stat_cache->consumer(session->fs) : session->fs;
+    std::unique_ptr<CompilerInvocation> ci =
+        buildCompilerInvocation(task.path, session->file.args, fs);
+    if (!ci)
+      continue;
     if (preamble) {
       bool rebuild = false;
       {
@@ -567,16 +571,25 @@ void *diagnosticMain(void *manager_) {
             rebuild = true;
           }
       }
+      if (!rebuild) {
+        std::string content = manager->wfiles->getContent(task.path);
+        auto buf = llvm::MemoryBuffer::getMemBuffer(content);
+#if LLVM_VERSION_MAJOR >= 12 // llvmorg-12-init-11522-g4c55c3b66de
+        PreambleBounds bounds =
+            ComputePreambleBounds(*ci->getLangOpts(), *buf, 0);
+#else
+        PreambleBounds bounds =
+            ComputePreambleBounds(*ci->getLangOpts(), buf.get(), 0);
+#endif
+        if (bounds.Size != preamble->preamble.getBounds().Size)
+          rebuild = true;
+      }
       if (rebuild) {
         manager->preamble_tasks.pushBack({task.path, nullptr, true}, true);
         continue;
       }
     }
 
-    std::unique_ptr<CompilerInvocation> ci =
-        buildCompilerInvocation(task.path, session->file.args, fs);
-    if (!ci)
-      continue;
     // If main file is a header, add -Wno-unused-function
     if (lookupExtension(session->file.filename).second)
       ci->getDiagnosticOpts().Warnings.push_back("no-unused-function");