[clang] Preserve UDL nodes in RemoveNestedImmediateInvocation

[zyn0217]

D63960 performs a tree transformation on AST to prevent evaluating constant expressions eagerly by removing recorded immediate consteval invocations from subexpressions. (See https://reviews.llvm.org/D63960#inline-600736 for its motivation.)

However, the UDL node has been replaced with a CallExpr in the default TreeTransform since ca844ab (inadvertently?). This confuses clangd as it relies on the exact AST node type to decide whether or not to present inlay hints for an expression.

With regard to the fix, I think it's enough to return the UDL expression as-is during the transformation: We've bound it to temporary in its construction, and there's no ConstantExpr to visit under a UDL.

Fixes #63898.

[llvmbot]

@llvm/pr-subscribers-clang

Changes

D63960 performs a tree transformation on AST to prevent evaluating constant expressions eagerly by removing recorded immediate consteval invocations from subexpressions. (See https://reviews.llvm.org/D63960#inline-600736 for its motivation.)

However, the UDL node has been replaced with a CallExpr in the default TreeTransform since ca844ab (inadvertently?). This confuses clangd as it relies on the exact AST node type to decide whether or not to present inlay hints for an expression.

With regard to the fix, I think it's enough to return the UDL expression as-is during the transformation: We've bound it to temporary in its construction, and there's no ConstantExpr to visit under a UDL.

Fixes #63898.

Full diff: https://github.com/llvm/llvm-project/pull/66641.diff

2 Files Affected:

• (modified) clang/lib/Sema/SemaExpr.cpp (+4-1)
• (added) clang/test/AST/ast-dump-udl-consteval.cpp (+17)

diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index 92496b03ecabe54..104da822aae2930 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -18438,7 +18438,10 @@ static void RemoveNestedImmediateInvocation(
       DRSet.erase(cast<DeclRefExpr>(E->getCallee()->IgnoreImplicit()));
       return Base::TransformCXXOperatorCallExpr(E);
     }
-    /// Base::TransformInitializer skip ConstantExpr so we need to visit them
+    /// Base::TransformUserDefinedLiteral doesn't preserve the
+    /// UserDefinedLiteral node.
+    ExprResult TransformUserDefinedLiteral(UserDefinedLiteral *E) { return E; }
+    /// Base::TransformInitializer skips ConstantExpr so we need to visit them
     /// here.
     ExprResult TransformInitializer(Expr *Init, bool NotCopyInit) {
       if (!Init)
diff --git a/clang/test/AST/ast-dump-udl-consteval.cpp b/clang/test/AST/ast-dump-udl-consteval.cpp
new file mode 100644
index 000000000000000..9da53f725172aba
--- /dev/null
+++ b/clang/test/AST/ast-dump-udl-consteval.cpp
@@ -0,0 +1,17 @@
+// RUN: %clang_cc1 -xc++ -std=c++23 -ast-dump %s | FileCheck %s
+
+int inline consteval operator""_u32(unsigned long long val) {
+  return val;
+}
+
+void udl() {
+  (void)(0_u32 + 1_u32);
+}
+
+// CHECK: `-BinaryOperator {{.+}} <col:10, col:18> 'int' '+'
+// CHECK-NEXT: |-ConstantExpr {{.+}} <col:10> 'int'
+// CHECK-NEXT: | |-value: Int 0
+// CHECK-NEXT: | `-UserDefinedLiteral {{.+}} <col:10> 'int'
+// CHECK: `-ConstantExpr {{.+}} <col:18> 'int'
+// CHECK-NEXT:   |-value: Int 1
+// CHECK-NEXT:   `-UserDefinedLiteral {{.+}} <col:18> 'int'

[zyn0217]

Ping~ Looking for a review :)

[HighCommander4]

I wonder if TreeTransform::TransformUserDefinedLiteral() should be doing something like RebuildUserDefinedLiteral().

Anyways, the patch looks reasonable to me but someone more familiar with Sema should review it.

[zyn0217]

Invite @shafik and @cor3ntin to have a look at this.

My apologies if I'm churning anyone's review backlog. Honestly, I have no idea who the appropriate reviewer/code owner is. :(

[cor3ntin]

@zyn0217 Can you add a release note indicating that #63898 was fixed? Otherwise it looks good to me.
Sorry for the long delay, feel free to ping me again

[zyn0217]

No problem! And here it is.
PTAL, thanks! @cor3ntin

[cor3ntin]

LGTM, thanks!