From 245da0a451e193dc4229ed8aed28cf34fa083ed4 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Thu, 1 Sep 2022 10:21:24 -0700 Subject: [PATCH] [modules] Fix callback argument thinko VisbleModuleSet::setVisible takes a callback, to inform of modules being made (transitively) visible. However, we were calling it as 'Vis(M)' from a recursive lambda, where 'M' is a capture of setVisible's M, module parameter. Thus we can invoke the callback multiple times, passing the same value to it each time. Everywhere else in the lambda, we refer to V.M of the lambda's Visiting parameter. We should be doing so for the callback. Thus we'll pass the outermost module on the outermost recursive call, and as we descend the imports, we'll pass each import to the callback. Reviewed By: iains Differential Revision: https://reviews.llvm.org/D135958 --- clang/lib/Basic/Module.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/lib/Basic/Module.cpp b/clang/lib/Basic/Module.cpp index 17b8318..9a58fae 100644 --- a/clang/lib/Basic/Module.cpp +++ b/clang/lib/Basic/Module.cpp @@ -653,7 +653,7 @@ void VisibleModuleSet::setVisible(Module *M, SourceLocation Loc, return; ImportLocs[ID] = Loc; - Vis(M); + Vis(V.M); // Make any exported modules visible. SmallVector Exports; -- 2.7.4