[clang][Interp] Properly adjust instance pointer in virtual calls #102800
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
clang
|
@llvm/pr-subscribers-clang Author: Timm Baeder (tbaederr) ChangesFull diff: https://github.com/llvm/llvm-project/pull/102800.diff 2 Files Affected:
diff --git a/clang/lib/AST/Interp/Interp.h b/clang/lib/AST/Interp/Interp.h
index af33d507ef8d7..67b3fc5064509 100644
--- a/clang/lib/AST/Interp/Interp.h
+++ b/clang/lib/AST/Interp/Interp.h
@@ -2633,9 +2633,10 @@ inline bool CallVirt(InterpState &S, CodePtr OpPC, const Function *Func,
ThisPtr.getFieldDesc()->getType()->getAsCXXRecordDecl();
if (Func->getParentDecl()->isDerivedFrom(ThisFieldDecl)) {
// If the function we call is further DOWN the hierarchy than the
- // FieldDesc of our pointer, just get the DeclDesc instead, which
- // is the furthest we might go up in the hierarchy.
- ThisPtr = ThisPtr.getDeclPtr();
+ // FieldDesc of our pointer, just go up the hierarchy of this field
+ // the furthest we can go.
+ while (ThisPtr.isBaseClass())
+ ThisPtr = ThisPtr.getBase();
}
}
diff --git a/clang/test/AST/Interp/records.cpp b/clang/test/AST/Interp/records.cpp
index 343665003c23e..e620bf9e0e041 100644
--- a/clang/test/AST/Interp/records.cpp
+++ b/clang/test/AST/Interp/records.cpp
@@ -1572,3 +1572,27 @@ namespace ctorOverrider {
constexpr Covariant1 cb;
}
#endif
+
+#if __cplusplus >= 202002L
+namespace VirtDtor {
+ struct X { char *p; constexpr ~X() { *p++ = 'X'; } };
+ struct Y : X { int y; virtual constexpr ~Y() { *p++ = 'Y'; } };
+ struct Z : Y { int z; constexpr ~Z() override { *p++ = 'Z'; } };
+
+ union VU {
+ constexpr VU() : z() {}
+ constexpr ~VU() {}
+ Z z;
+ };
+
+ constexpr char virt_dtor(int mode, const char *expected) {
+ char buff[4] = {};
+ VU vu;
+ vu.z.p = buff;
+
+ ((Y&)vu.z).~Y();
+ return true;
+ }
+ static_assert(virt_dtor(0, "ZYX"));
+}
+#endif
|
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/107/builds/1748 Here is the relevant piece of the build log for the reference: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
getDeclPtr()will not just return what we want, but in this case a pointer to thevulocal variable.