shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[clang][bytecode] Fix initializing base casts (#104901)

Browse Source 
Use delegate() there. To fix a follow-up problem, abort when a cast ends
up on a valid Pointer that isn't a base class.
This commit is contained in:
Timm Baeder 2024-08-20 11:44:30 +02:00 committed by GitHub
parent 66953c9582
commit ba7dadf0e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/AST/ByteCode/Compiler.cpp
View File

@ -214,7 +214,7 @@ bool Compiler<Emitter>::VisitCastExpr(const CastExpr *CE) {
unsigned DerivedOffset = collectBaseOffset(QualType(ToMP->getClass(), 0), unsigned DerivedOffset = collectBaseOffset(QualType(ToMP->getClass(), 0),
QualType(FromMP->getClass(), 0)); QualType(FromMP->getClass(), 0));
if (!this->visit(SubExpr)) if (!this->delegate(SubExpr))
return false; return false;
return this->emitGetMemberPtrBasePop(DerivedOffset, CE); return this->emitGetMemberPtrBasePop(DerivedOffset, CE);
@ -229,14 +229,14 @@ bool Compiler<Emitter>::VisitCastExpr(const CastExpr *CE) {
unsigned DerivedOffset = collectBaseOffset(QualType(FromMP->getClass(), 0), unsigned DerivedOffset = collectBaseOffset(QualType(FromMP->getClass(), 0),
QualType(ToMP->getClass(), 0)); QualType(ToMP->getClass(), 0));
if (!this->visit(SubExpr)) if (!this->delegate(SubExpr))
return false; return false;
return this->emitGetMemberPtrBasePop(-DerivedOffset, CE); return this->emitGetMemberPtrBasePop(-DerivedOffset, CE);
} }
case CK_UncheckedDerivedToBase: case CK_UncheckedDerivedToBase:
case CK_DerivedToBase: { case CK_DerivedToBase: {
if (!this->visit(SubExpr)) if (!this->delegate(SubExpr))
return false; return false;
const auto extractRecordDecl = [](QualType Ty) -> const CXXRecordDecl * { const auto extractRecordDecl = [](QualType Ty) -> const CXXRecordDecl * {
@ -265,7 +265,7 @@ bool Compiler<Emitter>::VisitCastExpr(const CastExpr *CE) {
} }
case CK_BaseToDerived: { case CK_BaseToDerived: {
if (!this->visit(SubExpr)) if (!this->delegate(SubExpr))
return false; return false;
unsigned DerivedOffset = unsigned DerivedOffset =

4
clang/lib/AST/ByteCode/Interp.h
View File

@ -1568,7 +1568,7 @@ inline bool GetPtrBase(InterpState &S, CodePtr OpPC, uint32_t Off) {
if (!CheckSubobject(S, OpPC, Ptr, CSK_Base)) if (!CheckSubobject(S, OpPC, Ptr, CSK_Base))
return false; return false;
const Pointer &Result = Ptr.atField(Off); const Pointer &Result = Ptr.atField(Off);
if (Result.isPastEnd()) if (Result.isPastEnd() || !Result.isBaseClass())
return false; return false;
S.Stk.push<Pointer>(Result); S.Stk.push<Pointer>(Result);
return true; return true;
@ -1581,7 +1581,7 @@ inline bool GetPtrBasePop(InterpState &S, CodePtr OpPC, uint32_t Off) {
if (!CheckSubobject(S, OpPC, Ptr, CSK_Base)) if (!CheckSubobject(S, OpPC, Ptr, CSK_Base))
return false; return false;
const Pointer &Result = Ptr.atField(Off); const Pointer &Result = Ptr.atField(Off);
if (Result.isPastEnd()) if (Result.isPastEnd() || !Result.isBaseClass())
return false; return false;
S.Stk.push<Pointer>(Result); S.Stk.push<Pointer>(Result);
return true; return true;

1
clang/test/Modules/merge-using-decls.cpp
View File

@ -8,6 +8,7 @@
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x c++ -I%S/Inputs/merge-using-decls -verify -std=c++11 %s -DORDER=2 // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x c++ -I%S/Inputs/merge-using-decls -verify -std=c++11 %s -DORDER=2
// RUN: %clang_cc1 -fexperimental-new-constant-interpreter -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x c++ -I%S/Inputs/merge-using-decls -verify -std=c++17 %s -DORDER=2 // RUN: %clang_cc1 -fexperimental-new-constant-interpreter -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x c++ -I%S/Inputs/merge-using-decls -verify -std=c++17 %s -DORDER=2
// RUN: %clang_cc1 -fexperimental-new-constant-interpreter -fmodules -fimplicit-module-maps -fexperimental-new-constant-interpreter -fmodules-cache-path=%t -x c++ -I%S/Inputs/merge-using-decls -verify -std=c++98 %s -DORDER=1
#if ORDER == 1 #if ORDER == 1
#include "a.h" #include "a.h"