This is an archive of the discontinued LLVM Phabricator instance.

Differential D151957

[NFC][CLANG] Fix bug with dereference null return value in GetFunctionTypeForVTable()
ClosedPublic

Authored by Manna on Jun 1 2023, 6:15 PM.

Details

Reviewers
erichkeane
Commits
rG02ce49afb9a0: [NFC][CLANG] Fix bug with dereference null return value in…
Summary

This patch uses castAs instead of getAs which will assert if the type doesn't match in clang::​CodeGen::​CodeGenTypes::​GetFunctionTypeForVTable(clang::​GlobalDecl).

Diff Detail

Event Timeline

Manna created this revision.Jun 1 2023, 6:15 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 1 2023, 6:15 PM
Manna requested review of this revision.Jun 1 2023, 6:15 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 1 2023, 6:15 PM
Manna edited the summary of this revision. (Show Details)Jun 1 2023, 6:16 PM
Harbormaster completed remote builds in B236047: Diff 527687.Jun 1 2023, 9:09 PM
erichkeane accepted this revision.Jun 2 2023, 6:23 AM
This revision is now accepted and ready to land.Jun 2 2023, 6:23 AM
Manna added a comment.Jun 2 2023, 6:48 AM

Thank you @erichkeane for reviews!

Closed by commit rG02ce49afb9a0: [NFC][CLANG] Fix bug with dereference null return value in… (authored by Manna). · Explain WhyJun 2 2023, 1:28 PM
This revision was automatically updated to reflect the committed changes.
Manna added a commit: rG02ce49afb9a0: [NFC][CLANG] Fix bug with dereference null return value in….

Revision Contents

PathSize
clang/
lib/
CodeGen/
2 lines

Diff 527687

clang/lib/CodeGen/CGCall.cpp

Show First 20 Lines • Show All 1,745 Lines • ▼ Show 20 LinesCodeGenTypes::GetFunctionType(const CGFunctionInfo &FI) {
bool Erased = FunctionsBeingProcessed.erase(&FI); (void)Erased; bool Erased = FunctionsBeingProcessed.erase(&FI); (void)Erased;
assert(Erased && "Not in set?"); assert(Erased && "Not in set?");
return llvm::FunctionType::get(resultType, ArgTypes, FI.isVariadic()); return llvm::FunctionType::get(resultType, ArgTypes, FI.isVariadic());
} }
llvm::Type *CodeGenTypes::GetFunctionTypeForVTable(GlobalDecl GD) { llvm::Type *CodeGenTypes::GetFunctionTypeForVTable(GlobalDecl GD) {
const CXXMethodDecl *MD = cast<CXXMethodDecl>(GD.getDecl()); const CXXMethodDecl *MD = cast<CXXMethodDecl>(GD.getDecl());
const FunctionProtoType *FPT = MD->getType()->getAs<FunctionProtoType>(); const FunctionProtoType *FPT = MD->getType()->castAs<FunctionProtoType>();
if (!isFuncTypeConvertible(FPT)) if (!isFuncTypeConvertible(FPT))
return llvm::StructType::get(getLLVMContext()); return llvm::StructType::get(getLLVMContext());
return GetFunctionType(GD); return GetFunctionType(GD);
} }
static void AddAttributesFromFunctionProtoType(ASTContext &Ctx, static void AddAttributesFromFunctionProtoType(ASTContext &Ctx,
▲ Show 20 Lines • Show All 4,069 Lines • Show Last 20 Lines