Fix an uninitialization bug

Author: zyn0217

clang-tools-extra/clangd/InlayHints.cpp

@@ -391,7 +391,7 @@ std::optional<Location> toLocation(SourceManager &SM, SourceRange Range) {
 
 class TypeInlayHintLabelPartBuilder
  : public TypeVisitor<TypeInlayHintLabelPartBuilder> {
- QualType Current;
+ QualType CurrentType;
  ASTContext &Context;
  const PrintingPolicy &PP;
  std::vector<InlayHintLabelPart> &LabelChunks;
@@ -404,12 +404,13 @@ class TypeInlayHintLabelPartBuilder
  bool PreviousShouldAddLinksToTagTypes;
  CurrentTypeRAII(TypeInlayHintLabelPartBuilder &Builder, QualType New,
  bool ShouldAddLinksToTagTypes)
- : Builder(Builder), PreviousType(Builder.Current) {
- Builder.Current = New;
+ : Builder(Builder), PreviousType(Builder.CurrentType),
+ PreviousShouldAddLinksToTagTypes(Builder.ShouldAddLinksToTagTypes) {
+ Builder.CurrentType = New;
  Builder.ShouldAddLinksToTagTypes = ShouldAddLinksToTagTypes;
  }
  ~CurrentTypeRAII() {
- Builder.Current = PreviousType;
+ Builder.CurrentType = PreviousType;
  Builder.ShouldAddLinksToTagTypes = PreviousShouldAddLinksToTagTypes;
  }
  };
@@ -511,13 +512,14 @@ class TypeInlayHintLabelPartBuilder
  bool ShouldAddLinksToTagTypes,
  llvm::StringRef Prefix,
  std::vector<InlayHintLabelPart> &LabelChunks)
- : Current(Current), Context(Context), PP(PP), LabelChunks(LabelChunks) {
+ : CurrentType(Current), Context(Context), PP(PP),
+ LabelChunks(LabelChunks) {
  LabelChunks.reserve(16);
  if (!Prefix.empty())
  addLabel(Prefix.str());
  }
 
- void VisitType(const Type *) { addLabel(Current.getAsString(PP)); }
+ void VisitType(const Type *) { addLabel(CurrentType.getAsString(PP)); }
 
  void VisitTagType(const TagType *TT) {
  if (!ShouldAddLinksToTagTypes)

clang-tools-extra/clangd/unittests/InlayHintTests.cpp

@@ -62,7 +62,7 @@ struct ExpectedHintLabelPiece {
  friend llvm::raw_ostream &operator<<(llvm::raw_ostream &Stream,
  const ExpectedHintLabelPiece &Hint) {
  Stream << Hint.Label;
- if (!Hint.TargetRangeName)
+ if (Hint.TargetRangeName)
  Stream << " that points to $" << Hint.TargetRangeName;
  return Stream;
  }
@@ -1769,12 +1769,15 @@ TEST(TypeHints, Links) {
  ExpectedHintLabelPiece{
  ": NttpContainer<D, E, ScopedEnum::X, Enum::E>"},
  Source)));
+
  EXPECT_THAT(
  HintAt(Hints, "5"),
  ElementsAre(
  HintLabelPieceMatcher(ExpectedHintLabelPiece{": Nested<"}, Source),
  HintLabelPieceMatcher(
  ExpectedHintLabelPiece{"Container", "Container"}, Source),
+ // We don't have links on the inner 'Class' because the location is
+ // where the 'auto' links to.
  HintLabelPieceMatcher(ExpectedHintLabelPiece{"<int>>::Class<"},
  Source),
  HintLabelPieceMatcher(ExpectedHintLabelPiece{"Package", "Package"},