Skip to content

Commit 21e6bad

Browse files
committed
[Gardening] Add an alias for a commonly-used set type
1 parent 3e76ea7 commit 21e6bad

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

include/swift/AST/EvaluatorDependencies.h

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ using DependencySource = llvm::PointerIntPair<SourceFile *, 1, DependencyScope>;
110110
struct DependencyRecorder;
111111

112112
struct DependencyCollector {
113+
friend DependencyRecorder;
114+
113115
struct Reference {
114116
public:
115117
enum class Kind {
@@ -177,8 +179,12 @@ struct DependencyCollector {
177179
};
178180
};
179181

182+
public:
183+
using ReferenceSet = llvm::DenseSet<Reference, Reference::Info>;
184+
185+
private:
180186
DependencyRecorder &parent;
181-
llvm::DenseSet<Reference, Reference::Info> scratch;
187+
ReferenceSet scratch;
182188

183189
public:
184190
explicit DependencyCollector(DependencyRecorder &parent) : parent(parent) {}
@@ -229,11 +235,7 @@ struct DependencyCollector {
229235
/// particular \c DependencyScope during the course of request evaluation.
230236
struct DependencyRecorder {
231237
friend DependencyCollector;
232-
private:
233-
/// A stack of dependency sources in the order they were evaluated.
234-
llvm::SmallVector<evaluator::DependencySource, 8> dependencySources;
235238

236-
public:
237239
enum class Mode {
238240
// Enables the current "status quo" behavior of the dependency collector.
239241
//
@@ -247,14 +249,17 @@ struct DependencyRecorder {
247249
// the primary file being acted upon instead of to the destination file.
248250
ExperimentalPrivateDependencies,
249251
};
250-
Mode mode;
251-
llvm::DenseMap<AnyRequest, llvm::DenseSet<DependencyCollector::Reference,
252-
DependencyCollector::Reference::Info>>
252+
253+
private:
254+
/// A stack of dependency sources in the order they were evaluated.
255+
llvm::SmallVector<evaluator::DependencySource, 8> dependencySources;
256+
llvm::DenseMap<AnyRequest, DependencyCollector::ReferenceSet>
253257
requestReferences;
258+
Mode mode;
254259
bool isRecording;
255260

256-
explicit DependencyRecorder(Mode mode)
257-
: mode{mode}, requestReferences{}, isRecording{false} {};
261+
public:
262+
explicit DependencyRecorder(Mode mode) : mode{mode}, isRecording{false} {};
258263

259264
private:
260265
void realize(const DependencyCollector::Reference &ref);

0 commit comments

Comments
 (0)