diff options
Diffstat (limited to 'clang/lib/CodeGen/CGDecl.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGDecl.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp index 8a1675848e13..29193e0c541b 100644 --- a/clang/lib/CodeGen/CGDecl.cpp +++ b/clang/lib/CodeGen/CGDecl.cpp @@ -1568,10 +1568,9 @@ CodeGenFunction::EmitAutoVarAlloca(const VarDecl &D) { ReturnValue.getElementType(), ReturnValue.getAlignment()); address = MaybeCastStackAddressSpace(AllocaAddr, Ty.getAddressSpace()); - if (const RecordType *RecordTy = Ty->getAs<RecordType>()) { - const auto *RD = RecordTy->getOriginalDecl()->getDefinitionOrSelf(); - const auto *CXXRD = dyn_cast<CXXRecordDecl>(RD); - if ((CXXRD && !CXXRD->hasTrivialDestructor()) || + if (const auto *RD = Ty->getAsRecordDecl()) { + if (const auto *CXXRD = dyn_cast<CXXRecordDecl>(RD); + (CXXRD && !CXXRD->hasTrivialDestructor()) || RD->isNonTrivialToPrimitiveDestroy()) { // Create a flag that is used to indicate when the NRVO was applied // to this variable. Set it to zero to indicate that NRVO was not @@ -2728,10 +2727,7 @@ void CodeGenFunction::EmitParmDecl(const VarDecl &D, ParamValue Arg, // Don't push a cleanup in a thunk for a method that will also emit a // cleanup. if (Ty->isRecordType() && !CurFuncIsThunk && - Ty->castAs<RecordType>() - ->getOriginalDecl() - ->getDefinitionOrSelf() - ->isParamDestroyedInCallee()) { + Ty->castAsRecordDecl()->isParamDestroyedInCallee()) { if (QualType::DestructionKind DtorKind = D.needsDestruction(getContext())) { assert((DtorKind == QualType::DK_cxx_destructor || |