This revision was automatically updated to reflect the committed changes.
Closed by commit rGf007c99ed12f: [clang][Interp] Fix InterpFrame::describe()
for This pointers (authored by tbaeder).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D136670/new/
https://reviews.llvm.org/D136670
Files:
clang/lib/AST/Interp/InterpFrame.cpp
clang/test/AST/Interp/records.cpp
Index: clang/test/AST/Interp/records.cpp
===================================================================
--- clang/test/AST/Interp/records.cpp
+++ clang/test/AST/Interp/records.cpp
@@ -257,11 +257,6 @@
static_assert(D.Val == 0, ""); // ref-error {{not an integral constant
expression}} \
// ref-note {{initializer of 'D' is not a
constant expression}}
-#if 0
- // FIXME: This test is currently disabled because the failing constructor
call
- // causes us to run into an assertion later on in the new interpreter.
- // Once that is fixed, we fail successfully but the diagnostic uses the
- // wrong value.
struct AnotherBase {
int Val;
constexpr AnotherBase(int i) : Val(12 / i) {} //ref-note {{division by
zero}} \
@@ -274,9 +269,7 @@
constexpr AnotherBase Derp(0); // ref-error {{must be initialized by a
constant expression}} \
// ref-note {{in call to 'AnotherBase(0)'}} \
// expected-error {{must be initialized by a
constant expression}} \
- // expected-note {{in call to 'AnotherBase(}}
- // FIXME Previous note uses the wrong value
-#endif
+ // expected-note {{in call to
'AnotherBase(0)'}}
struct YetAnotherBase {
int Val;
Index: clang/lib/AST/Interp/InterpFrame.cpp
===================================================================
--- clang/lib/AST/Interp/InterpFrame.cpp
+++ clang/lib/AST/Interp/InterpFrame.cpp
@@ -149,7 +149,11 @@
OS << "->";
}
OS << *F << "(";
- unsigned Off = Func->hasRVO() ? primSize(PT_Ptr) : 0;
+ unsigned Off = 0;
+
+ Off += Func->hasRVO() ? primSize(PT_Ptr) : 0;
+ Off += Func->hasThisPointer() ? primSize(PT_Ptr) : 0;
+
for (unsigned I = 0, N = F->getNumParams(); I < N; ++I) {
QualType Ty = F->getParamDecl(I)->getType();
Index: clang/test/AST/Interp/records.cpp
===================================================================
--- clang/test/AST/Interp/records.cpp
+++ clang/test/AST/Interp/records.cpp
@@ -257,11 +257,6 @@
static_assert(D.Val == 0, ""); // ref-error {{not an integral constant expression}} \
// ref-note {{initializer of 'D' is not a constant expression}}
-#if 0
- // FIXME: This test is currently disabled because the failing constructor call
- // causes us to run into an assertion later on in the new interpreter.
- // Once that is fixed, we fail successfully but the diagnostic uses the
- // wrong value.
struct AnotherBase {
int Val;
constexpr AnotherBase(int i) : Val(12 / i) {} //ref-note {{division by zero}} \
@@ -274,9 +269,7 @@
constexpr AnotherBase Derp(0); // ref-error {{must be initialized by a constant expression}} \
// ref-note {{in call to 'AnotherBase(0)'}} \
// expected-error {{must be initialized by a constant expression}} \
- // expected-note {{in call to 'AnotherBase(}}
- // FIXME Previous note uses the wrong value
-#endif
+ // expected-note {{in call to 'AnotherBase(0)'}}
struct YetAnotherBase {
int Val;
Index: clang/lib/AST/Interp/InterpFrame.cpp
===================================================================
--- clang/lib/AST/Interp/InterpFrame.cpp
+++ clang/lib/AST/Interp/InterpFrame.cpp
@@ -149,7 +149,11 @@
OS << "->";
}
OS << *F << "(";
- unsigned Off = Func->hasRVO() ? primSize(PT_Ptr) : 0;
+ unsigned Off = 0;
+
+ Off += Func->hasRVO() ? primSize(PT_Ptr) : 0;
+ Off += Func->hasThisPointer() ? primSize(PT_Ptr) : 0;
+
for (unsigned I = 0, N = F->getNumParams(); I < N; ++I) {
QualType Ty = F->getParamDecl(I)->getType();
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
