Skip to content

Commit b8638c3

Browse files
refactor: the usage requirements the edges carry are defined beside the edges; graph.cpp within its length
Co-authored-by: speak-agent <248744407+speak-agent@users.noreply.github.com>
1 parent e2e64f7 commit b8638c3

3 files changed

Lines changed: 88 additions & 77 deletions

File tree

‎src/build/prepare/graph.cpp‎

Lines changed: 1 addition & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -2249,82 +2249,7 @@ step4b_define_provisioning_closures(PrepareState& state) {
22492249
}
22502250

22512251

2252-
state.computeUsageRequirements = [&] {
2253-
bool changed = true;
2254-
while (changed) {
2255-
changed = false;
2256-
for (auto const& edge : state.dependencyEdges) {
2257-
if (edge.consumerPackageIndex >= state.packages.size()
2258-
|| edge.dependencyPackageIndex >= state.packages.size()) {
2259-
continue;
2260-
}
2261-
auto& consumer = state.packages[edge.consumerPackageIndex];
2262-
auto const& dependency = state.packages[edge.dependencyPackageIndex];
2263-
// A build dependency serves the build program, which is planned
2264-
// in its own graph: its include directories and interface
2265-
// defines do not reach this consumer's target compile (mcpp#797).
2266-
if (edge.buildTable) continue;
2267-
// A package of programs publishes no usage requirements to its
2268-
// consumers (#649 E6): nothing of it is compiled or linked here.
2269-
if (edge.dependencyPackageIndex > 0
2270-
&& state.isProgramOnlyPackage(dependency.manifest)) continue;
2271-
2272-
// A dev-dependency serves the consumer's tests: its usage
2273-
// reaches the test units and neither the consumer's own
2274-
// sources nor the consumer's users, so those sources compile
2275-
// under `mcpp test` as under `mcpp build`.
2276-
if (edge.devTable) {
2277-
auto& tests = consumer.testBuild;
2278-
changed = state.appendUniquePaths(tests.includeDirs, dependency.publicUsage.includeDirs)
2279-
|| changed;
2280-
changed = state.appendUniquePaths(tests.includeDirsAfter,
2281-
dependency.publicUsage.includeDirsAfter)
2282-
|| changed;
2283-
changed = state.appendUniqueFlags(tests.cflags, dependency.publicUsage.cflags) || changed;
2284-
changed = state.appendUniqueFlags(tests.cxxflags, dependency.publicUsage.cxxflags) || changed;
2285-
continue;
2286-
}
2287-
2288-
if (edge.visibility == mcpp::modgraph::DependencyVisibility::Private
2289-
|| edge.visibility == mcpp::modgraph::DependencyVisibility::Public) {
2290-
changed = state.appendUniquePaths(consumer.privateBuild.includeDirs,
2291-
dependency.publicUsage.includeDirs)
2292-
|| changed;
2293-
// #249: after-dirs ride the same edges but keep their
2294-
// after-ness — consumers receive them as -idirafter,
2295-
// never upgraded to -I.
2296-
changed = state.appendUniquePaths(consumer.privateBuild.includeDirsAfter,
2297-
dependency.publicUsage.includeDirsAfter)
2298-
|| changed;
2299-
// Interface defines (a dependency's active-feature `defines`)
2300-
// ride the same edges as include dirs: they must reach the
2301-
// consumer's own TUs so header-only switches like
2302-
// EIGEN_USE_BLAS take effect where the headers are used.
2303-
changed = state.appendUniqueFlags(consumer.privateBuild.cflags,
2304-
dependency.publicUsage.cflags)
2305-
|| changed;
2306-
changed = state.appendUniqueFlags(consumer.privateBuild.cxxflags,
2307-
dependency.publicUsage.cxxflags)
2308-
|| changed;
2309-
}
2310-
if (edge.visibility == mcpp::modgraph::DependencyVisibility::Public
2311-
|| edge.visibility == mcpp::modgraph::DependencyVisibility::Interface) {
2312-
changed = state.appendUniquePaths(consumer.publicUsage.includeDirs,
2313-
dependency.publicUsage.includeDirs)
2314-
|| changed;
2315-
changed = state.appendUniquePaths(consumer.publicUsage.includeDirsAfter,
2316-
dependency.publicUsage.includeDirsAfter)
2317-
|| changed;
2318-
changed = state.appendUniqueFlags(consumer.publicUsage.cflags,
2319-
dependency.publicUsage.cflags)
2320-
|| changed;
2321-
changed = state.appendUniqueFlags(consumer.publicUsage.cxxflags,
2322-
dependency.publicUsage.cxxflags)
2323-
|| changed;
2324-
}
2325-
}
2326-
}
2327-
};
2252+
define_usage_requirements(state);
23282253

23292254
return {};
23302255
}

‎src/build/prepare/graph_edges.cpp‎

Lines changed: 85 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// graph_edges.cpp -- P4b: the edges the dependency worklist records, one per
22
// consumer, dependency, visibility and table, with what each edge asks of its
3-
// dependency. Split from graph.cpp at the boundary of what an edge is, when the
3+
// dependency, and the usage requirements the edges carry. Split from graph.cpp at the boundary of what an edge is, when the
44
// edge learned to carry `embed' and `exclude' (design 2026-11-02 §14.1).
55

66
module mcpp.build.prepare;
@@ -136,4 +136,88 @@ void recordDependencyEdge(
136136
});
137137
}
138138

139+
// The usage requirements every edge carries to its consumer: a dependency's
140+
// public usage reaches the consumer's own units (Private, Public), its users
141+
// (Public, Interface), or, on a dev edge, the consumer's tests only. A fixpoint
142+
// over `dependencyEdges`, run again whenever a pass changed what a package
143+
// publishes.
144+
void define_usage_requirements(PrepareState& state) {
145+
state.computeUsageRequirements = [&state] {
146+
bool changed = true;
147+
while (changed) {
148+
changed = false;
149+
for (auto const& edge : state.dependencyEdges) {
150+
if (edge.consumerPackageIndex >= state.packages.size()
151+
|| edge.dependencyPackageIndex >= state.packages.size()) {
152+
continue;
153+
}
154+
auto& consumer = state.packages[edge.consumerPackageIndex];
155+
auto const& dependency = state.packages[edge.dependencyPackageIndex];
156+
// A build dependency serves the build program, which is planned
157+
// in its own graph: its include directories and interface
158+
// defines do not reach this consumer's target compile (mcpp#797).
159+
if (edge.buildTable) continue;
160+
// A package of programs publishes no usage requirements to its
161+
// consumers (#649 E6): nothing of it is compiled or linked here.
162+
if (edge.dependencyPackageIndex > 0
163+
&& state.isProgramOnlyPackage(dependency.manifest)) continue;
164+
165+
// A dev-dependency serves the consumer's tests: its usage
166+
// reaches the test units and neither the consumer's own
167+
// sources nor the consumer's users, so those sources compile
168+
// under `mcpp test` as under `mcpp build`.
169+
if (edge.devTable) {
170+
auto& tests = consumer.testBuild;
171+
changed = state.appendUniquePaths(tests.includeDirs, dependency.publicUsage.includeDirs)
172+
|| changed;
173+
changed = state.appendUniquePaths(tests.includeDirsAfter,
174+
dependency.publicUsage.includeDirsAfter)
175+
|| changed;
176+
changed = state.appendUniqueFlags(tests.cflags, dependency.publicUsage.cflags) || changed;
177+
changed = state.appendUniqueFlags(tests.cxxflags, dependency.publicUsage.cxxflags) || changed;
178+
continue;
179+
}
180+
181+
if (edge.visibility == mcpp::modgraph::DependencyVisibility::Private
182+
|| edge.visibility == mcpp::modgraph::DependencyVisibility::Public) {
183+
changed = state.appendUniquePaths(consumer.privateBuild.includeDirs,
184+
dependency.publicUsage.includeDirs)
185+
|| changed;
186+
// #249: after-dirs ride the same edges but keep their
187+
// after-ness — consumers receive them as -idirafter,
188+
// never upgraded to -I.
189+
changed = state.appendUniquePaths(consumer.privateBuild.includeDirsAfter,
190+
dependency.publicUsage.includeDirsAfter)
191+
|| changed;
192+
// Interface defines (a dependency's active-feature `defines`)
193+
// ride the same edges as include dirs: they must reach the
194+
// consumer's own TUs so header-only switches like
195+
// EIGEN_USE_BLAS take effect where the headers are used.
196+
changed = state.appendUniqueFlags(consumer.privateBuild.cflags,
197+
dependency.publicUsage.cflags)
198+
|| changed;
199+
changed = state.appendUniqueFlags(consumer.privateBuild.cxxflags,
200+
dependency.publicUsage.cxxflags)
201+
|| changed;
202+
}
203+
if (edge.visibility == mcpp::modgraph::DependencyVisibility::Public
204+
|| edge.visibility == mcpp::modgraph::DependencyVisibility::Interface) {
205+
changed = state.appendUniquePaths(consumer.publicUsage.includeDirs,
206+
dependency.publicUsage.includeDirs)
207+
|| changed;
208+
changed = state.appendUniquePaths(consumer.publicUsage.includeDirsAfter,
209+
dependency.publicUsage.includeDirsAfter)
210+
|| changed;
211+
changed = state.appendUniqueFlags(consumer.publicUsage.cflags,
212+
dependency.publicUsage.cflags)
213+
|| changed;
214+
changed = state.appendUniqueFlags(consumer.publicUsage.cxxflags,
215+
dependency.publicUsage.cxxflags)
216+
|| changed;
217+
}
218+
}
219+
}
220+
};
221+
}
222+
139223
} // namespace mcpp::build

‎src/build/prepare/state.cppm‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -974,6 +974,8 @@ void recordDependencyEdge(PrepareState& state, std::size_t consumerDepIndex,
974974
std::size_t dependencyPackageIndex,
975975
const mcpp::manifest::DependencySpec& spec, bool buildTable,
976976
const std::string& writtenKey);
977+
// graph_edges.cpp: defines `PrepareState::computeUsageRequirements`.
978+
void define_usage_requirements(PrepareState& state);
977979
std::expected<void, std::string> phase4b_graph_worklist(PrepareState& state);
978980
// graph.cpp: takes the link flags package `p` added to the root's pooled list
979981
// back out of it (a package that serves the build alone; an embedded one).

0 commit comments

Comments
 (0)