Skip to content

Add null-type guards before QualType::getFromOpaquePtr #968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aaronj0 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add null-type guards before QualType::getFromOpaquePtr #968

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions lib/CppInterOp/CppInterOp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2100,6 +2100,8 @@ bool IsSameType(TCppType_t type_a, TCppType_t type_b) {

bool IsPointerType(TCppType_t type) {
INTEROP_TRACE(type);
if (!type)
return INTEROP_RETURN(false);
QualType QT = QualType::getFromOpaquePtr(type);
return INTEROP_RETURN(QT->isPointerType());
}
Expand All @@ -2122,12 +2124,16 @@ TCppType_t GetPointeeType(TCppType_t type) {

bool IsReferenceType(TCppType_t type) {
INTEROP_TRACE(type);
if (!type)
return INTEROP_RETURN(nullptr);
QualType QT = QualType::getFromOpaquePtr(type);
return INTEROP_RETURN(QT->isReferenceType());
}

ValueKind GetValueKind(TCppType_t type) {
INTEROP_TRACE(type);
if (!type)
return INTEROP_RETURN(nullptr);
QualType QT = QualType::getFromOpaquePtr(type);
if (QT->isRValueReferenceType())
return INTEROP_RETURN(ValueKind::RValue);
Expand All @@ -2138,12 +2144,16 @@ ValueKind GetValueKind(TCppType_t type) {

TCppType_t GetPointerType(TCppType_t type) {
INTEROP_TRACE(type);
if (!type)
return INTEROP_RETURN(nullptr);
QualType QT = QualType::getFromOpaquePtr(type);
return INTEROP_RETURN(getASTContext().getPointerType(QT).getAsOpaquePtr());
}

TCppType_t GetReferencedType(TCppType_t type, bool rvalue) {
INTEROP_TRACE(type, rvalue);
if (!type)
return INTEROP_RETURN(nullptr);
QualType QT = QualType::getFromOpaquePtr(type);
if (rvalue)
return INTEROP_RETURN(
Expand Down Expand Up @@ -2183,6 +2193,8 @@ TCppType_t GetUnderlyingType(TCppType_t type) {

std::string GetTypeAsString(TCppType_t var) {
INTEROP_TRACE(var);
if (!var)
return INTEROP_RETURN("");
QualType QT = QualType::getFromOpaquePtr(var);
PrintingPolicy Policy(getASTContext().getPrintingPolicy());
Policy.Bool = true; // Print bool instead of _Bool.
Expand Down Expand Up @@ -2393,6 +2405,8 @@ TCppType_t GetType(const std::string& name) {

TCppType_t GetComplexType(TCppType_t type) {
INTEROP_TRACE(type);
if (!type)
return INTEROP_RETURN(nullptr);
QualType QT = QualType::getFromOpaquePtr(type);

return INTEROP_RETURN(getASTContext().getComplexType(QT).getAsOpaquePtr());
Expand Down Expand Up @@ -4463,6 +4477,8 @@ std::vector<long int> GetDimensions(TCppType_t type) {

bool IsTypeDerivedFrom(TCppType_t derived, TCppType_t base) {
INTEROP_TRACE(derived, base);
if (!derived || !base)
return INTEROP_RETURN(false);
auto& S = getSema();
auto fakeLoc = GetValidSLoc(S);
auto derivedType = clang::QualType::getFromOpaquePtr(derived);
Expand Down
Loading