Swift: replace friend in TrapLabel with unsafeCreateFromExplicitId

redsun82 · redsun82 · commit a46582d7d515 · 2022-05-11T14:42:55.000+02:00
diff --git a/swift/extractor/trap/TrapArena.h b/swift/extractor/trap/TrapArena.h
@@ -16,7 +16,7 @@ class TrapArena {
  public:
   template <typename Tag>
   TrapLabel<Tag> allocateLabel() {
-    return {id_++};
+    return TrapLabel<Tag>::unsafeCreateFromExplicitId(id_++);
   }
 };
 
diff --git a/swift/extractor/trap/TrapLabel.h b/swift/extractor/trap/TrapLabel.h
@@ -34,16 +34,14 @@ class TrapLabel : public UntypedTrapLabel {
 
   using UntypedTrapLabel::UntypedTrapLabel;
 
-  // we want one authority tasked with creating labels to avoid conflicts, having access to the
-  // private constructor
-  // this is the TrapArena class for the moment
-  friend class TrapArena;
-
  public:
   using Tag = TagParam;
 
   TrapLabel() = default;
 
+  // The caller is responsible for ensuring ID uniqueness.
+  static TrapLabel unsafeCreateFromExplicitId(uint64_t id) { return {id}; }
+
   template <typename OtherTag>
   TrapLabel(const TrapLabel<OtherTag>& other) : UntypedTrapLabel(other) {
     // we temporarily need to bypass the label type system for unknown AST nodes and types

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class TrapArena {`
`16`	`16`	`public:`
`17`	`17`	`template <typename Tag>`
`18`	`18`	`TrapLabel<Tag> allocateLabel() {`
`19`		`- return {id_++};`
	`19`	`+ return TrapLabel<Tag>::unsafeCreateFromExplicitId(id_++);`
`20`	`20`	`}`
`21`	`21`	`};`
`22`	`22`