Skip to content
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

Jump to bottom

[Clang] Fix 'counted_by' for nested struct pointers #110497

Merged
merged 5 commits into from
Oct 3, 2024
Merged

[Clang] Fix 'counted_by' for nested struct pointers #110497

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
15b6932
[Clang] Fix 'counted_by' for nested struct pointers
Cydox Sep 29, 2024
0bdcbc6
[Clang] cleanup CodeGenFunction::EmitLoadOfCountedByField
Cydox Oct 1, 2024
841286c
no special case for MemberExpr, just LValue
Cydox Oct 2, 2024
60c3bd8
check for pointer, not LValue
Cydox Oct 3, 2024
06d39e3
check if StructBase is LValue
Cydox Oct 3, 2024
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
11 changes: 5 additions & 6 deletions clang/lib/CodeGen/CGExpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
//
//===----------------------------------------------------------------------===//

#include <iostream>
#include "ABIInfoImpl.h"
#include "CGCUDARuntime.h"
#include "CGCXXABI.h"
Expand Down Expand Up @@ -1164,15 +1163,15 @@ llvm::Value *CodeGenFunction::EmitLoadOfCountedByField(
return nullptr;

llvm::Value *Res = nullptr;
if (StructBase->isLValue()) {
LValue LV = EmitLValue(StructBase);
Address Addr = LV.getAddress();
Res = Addr.emitRawPointer(*this);
} else {
if (StructBase->getType()->isPointerType()) {
LValueBaseInfo BaseInfo;
TBAAAccessInfo TBAAInfo;
Address Addr = EmitPointerWithAlignment(StructBase, &BaseInfo, &TBAAInfo);
Res = Addr.emitRawPointer(*this);
} else {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should I add a check for StructBase->isLValue() and add an else statement that returns nullptr?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added that extra check

LValue LV = EmitLValue(StructBase);
Address Addr = LV.getAddress();
Res = Addr.emitRawPointer(*this);
}

RecIndicesTy Indices;
Expand Down
Loading