================
@@ -200,4 +201,102 @@ TEST_F(ModuleCacheTest, CachedModuleNewPathAllowErrors) {
ASSERT_TRUE(Diags->hasErrorOccurred());
}
+struct CapturedDiag {
+ unsigned ID;
+ std::string Message;
+};
+
+class CapturedDiagConsumer : public DiagnosticConsumer {
+ std::vector<CapturedDiag> &Diags;
+
+public:
+ CapturedDiagConsumer(std::vector<CapturedDiag> &D) : Diags(D) {}
+ void HandleDiagnostic(DiagnosticsEngine::Level Level,
+ const Diagnostic &Info) override {
+ DiagnosticConsumer::HandleDiagnostic(Level, Info);
+ SmallString<128> Msg;
+ Info.FormatDiagnostic(Msg);
+ Diags.push_back({Info.getID(), std::string(Msg)});
+ }
+};
+
+TEST_F(ModuleCacheTest, RebuildFinalizedModuleAfterInputChange) {
+ addFile("test.m", R"cpp(
+ @import M;
+ )cpp");
+ addFile("frameworks/M.framework/Headers/m.h", R"cpp(
+ void foo(void);
+ )cpp");
+ addFile("frameworks/M.framework/Modules/module.modulemap", R"cpp(
+ framework module M [system] {
+ header "m.h"
+ export *
+ }
+ )cpp");
+
+ SmallString<256> MCPArg("-fmodules-cache-path=");
+ MCPArg.append(ModuleCachePath);
+ CreateInvocationOptions CIOpts;
+ CIOpts.VFS = llvm::vfs::createPhysicalFileSystem();
+ DiagnosticOptions DiagOpts;
+ IntrusiveRefCntPtr<DiagnosticsEngine> Diags =
+ CompilerInstance::createDiagnostics(*CIOpts.VFS, DiagOpts);
+ CIOpts.Diags = Diags;
+
+ const char *Args[] = {"clang", "-fmodules", "-Fframeworks",
+ MCPArg.c_str(), "-working-directory", TestDir.c_str(),
+ "test.m"};
+
+ // Run 1: builds, loads, and finalizes M in the shared in-memory cache.
+ std::shared_ptr<CompilerInvocation> Invocation =
+ createInvocationAndEnableFree(Args, CIOpts);
+ ASSERT_TRUE(Invocation);
+ CompilerInstance Instance(std::move(Invocation));
+ Instance.setVirtualFileSystem(CIOpts.VFS);
+ Instance.setDiagnostics(Diags);
+ SyntaxOnlyAction Action;
+ ASSERT_TRUE(Instance.ExecuteAction(Action));
+ ASSERT_FALSE(Diags->hasErrorOccurred());
+
+ // Grow m.h so its recorded size no longer matches, marking M out of date on
+ // the next load. Because M is finalized in the shared cache, it can be
+ // neither dropped nor rebuilt.
+ addFile("frameworks/M.framework/Headers/m.h", R"cpp(
+ void foo(void);
+ void bar(void);
+ void baz(void);
+ )cpp");
+
+ std::vector<CapturedDiag> Captured;
+ Diags->setClient(new CapturedDiagConsumer(Captured),
+ /*ShouldOwnClient=*/true);
+
+ // Run 2 shares the module cache (and thus the finalized M).
+ std::shared_ptr<CompilerInvocation> Invocation2 =
+ createInvocationAndEnableFree(Args, CIOpts);
+ ASSERT_TRUE(Invocation2);
+ CompilerInstance Instance2(std::move(Invocation2),
+ Instance.getPCHContainerOperations(),
+ Instance.getModuleCachePtr());
+ Instance2.setVirtualFileSystem(CIOpts.VFS);
+ Instance2.setDiagnostics(Diags);
+ SyntaxOnlyAction Action2;
+ ASSERT_FALSE(Instance2.ExecuteAction(Action2));
+ ASSERT_TRUE(Diags->hasErrorOccurred());
+
+ ASSERT_EQ(Captured.size(), 4u);
+ EXPECT_EQ(Captured[0].ID, (unsigned)diag::err_fe_ast_file_modified);
+ EXPECT_NE(Captured[0].Message.find("m.h"), std::string::npos);
+ EXPECT_EQ(Captured[1].ID, (unsigned)diag::note_fe_ast_file_modified);
+ EXPECT_EQ(Captured[2].ID,
+ (unsigned)diag::note_fe_ast_file_modified_finalized);
+ EXPECT_NE(Captured[2].Message.find("'M'"), std::string::npos);
+ EXPECT_EQ(Captured[3].ID,
+ (unsigned)diag::note_ast_file_input_files_validation_status);
+
+ // Make sure we do not see the generic error anywhere.
+ for (const auto &D : Captured)
----------------
cyndyishida wrote:
Do you still need this if you are checking the full set of captured diags
explicitly?
https://github.com/llvm/llvm-project/pull/209857
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
