Only apply the restriction to __builtin_dump_struct

Author: zyn0217

clang-tools-extra/clangd/InlayHints.cpp

@@ -590,15 +590,15 @@ class InlayHintVisitor : public RecursiveASTVisitor<InlayHintVisitor> {
   }
 
   bool dataTraverseStmtPre(Stmt *S) {
-    // Do not show inlay hints for PseudoObjectExprs. They're never
-    // genuine user codes.
-    //
-    // For example, __builtin_dump_struct would expand to a PseudoObjectExpr
-    // that includes a couple of calls to a printf function. Printing parameter
-    // names for that anyway would end up with duplicate parameter names (which,
-    // however, got de-duplicated after visiting) for the printf function.
-    if (isa<PseudoObjectExpr>(S))
-      return false;
+    // Do not show inlay hints for the __builtin_dump_struct, which would expand
+    // to a PseudoObjectExpr that includes a couple of calls to a printf
+    // function. Printing parameter names for that anyway would end up with
+    // duplicate parameter names (which, however, got de-duplicated after
+    // visiting) for the printf function.
+    if (auto *POE = dyn_cast<PseudoObjectExpr>(S))
+      if (auto *CE = dyn_cast<CallExpr>(POE->getSyntacticForm());
+          CE && CE->getBuiltinCallee() == Builtin::BI__builtin_dump_struct)
+        return false;
     return true;
   }
 

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

@@ -1729,7 +1729,7 @@ TEST(ParameterHints, PseudoObjectExpr) {
     struct S {
       __declspec(property(get=GetX, put=PutX)) int x[];
       int GetX(int y, int z) { return 42 + y; }
-      void PutX(int y) { x = y; } // Not `x = y: y`
+      void PutX(int y) { x = $one[[y]]; } // FIXME: Undesired `x = y: y` for this ill-formed expression.
     };
 
     int printf(const char *Format, ...);
@@ -1738,14 +1738,17 @@ TEST(ParameterHints, PseudoObjectExpr) {
       S s;
       __builtin_dump_struct(&s, printf); // Not `Format: __builtin_dump_struct()`
       printf($Param[["Hello, %d"]], 42); // Normal calls are not affected.
-      return s.x[1][2]; // Not `x[y: 1][z: 2]`
+      return s.x[ $two[[1]] ][ $three[[2]] ]; // `x[y: 1][z: 2]`
     }
   )cpp");
   auto TU = TestTU::withCode(Code.code());
   TU.ExtraArgs.push_back("-fms-extensions");
   auto AST = TU.build();
   EXPECT_THAT(inlayHints(AST, std::nullopt),
-              ElementsAre(HintMatcher(ExpectedHint{"Format: ", "Param"}, Code)));
+              ElementsAre(HintMatcher(ExpectedHint{"y: ", "one"}, Code),
+                          HintMatcher(ExpectedHint{"Format: ", "Param"}, Code),
+                          HintMatcher(ExpectedHint{"y: ", "two"}, Code),
+                          HintMatcher(ExpectedHint{"z: ", "three"}, Code)));
 }
 
 TEST(ParameterHints, ArgPacksAndConstructors) {