https://github.com/vitalybuka created
https://github.com/llvm/llvm-project/pull/102785
Reverts llvm/llvm-project#102735
Breaks
>From 7e8bb8c52f51fd6b41c0b6485b93fd0315b58bab Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalyb...@gmail.com>
Date: Sat, 10 Aug 2024 19:55:54 -0700
Subject: [PATCH] Revert "[clang][Interp] Improve "in call to" call argument
printing (#102735)"
This reverts commit 979abf142f606bf43a5500e59d72f1286a7180c7.
---
clang/lib/AST/Interp/InterpFrame.cpp | 5 ++---
.../test/AST/Interp/constexpr-frame-describe.cpp | 15 ---------------
2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/clang/lib/AST/Interp/InterpFrame.cpp
b/clang/lib/AST/Interp/InterpFrame.cpp
index 4530f28d694e84..27108f957305f3 100644
--- a/clang/lib/AST/Interp/InterpFrame.cpp
+++ b/clang/lib/AST/Interp/InterpFrame.cpp
@@ -102,9 +102,8 @@ void InterpFrame::popArgs() {
}
template <typename T>
-static void print(llvm::raw_ostream &OS, const T &V, ASTContext &ASTCtx,
- QualType Ty) {
- V.toAPValue(ASTCtx).printPretty(OS, ASTCtx, Ty);
+static void print(llvm::raw_ostream &OS, const T &V, ASTContext &, QualType) {
+ OS << V;
}
template <>
diff --git a/clang/test/AST/Interp/constexpr-frame-describe.cpp
b/clang/test/AST/Interp/constexpr-frame-describe.cpp
index a0ae046fc01786..e039fd61ae9812 100644
--- a/clang/test/AST/Interp/constexpr-frame-describe.cpp
+++ b/clang/test/AST/Interp/constexpr-frame-describe.cpp
@@ -81,18 +81,3 @@ static_assert(bar.fail2<int*, 42>()); // both-error
{{constant expression}} \
static_assert(bar.fail3(3, 4UL, bar, &bar)); // both-error {{constant
expression}} \
// expected-note {{in call to
'bar.fail3<int, unsigned long, Bar<int>, const Bar<int> *>(3, 4, &bar, &bar)'}}
\
// ref-note {{in call to
'bar.fail3<int, unsigned long, Bar<int>, const Bar<int> *>(3, 4, {}, &bar)'}}
-
-
-
-/// FIXME: Bound member pointer printing doesn't work right, see the last
parameter to MemPtr().
-struct MemPtrTest {
- int n;
- void f();
-};
-MemPtrTest mpt; // both-note {{here}}
-constexpr int MemPtr(int (MemPtrTest::*a), void (MemPtrTest::*b)(), int &c) {
- return c; // both-note {{read of non-constexpr variable 'mpt'}}
-}
-static_assert(MemPtr(&MemPtrTest::n, &MemPtrTest::f, mpt.*&MemPtrTest::n),
""); // both-error {{constant expression}} \
-
// expected-note {{in call to 'MemPtr(&MemPtrTest::n, &MemPtrTest::f, mpt)'}} \
-
// ref-note {{in call to 'MemPtr(&MemPtrTest::n, &MemPtrTest::f, mpt.n)'}}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
