This is an archive of the discontinued LLVM Phabricator instance.

Differential D77119

[AVR] Fix function pointer address space
ClosedPublic

Authored by vlastik on Mar 31 2020, 12:50 AM.

Details

Reviewers
dylanmckay
Commits
rG57fd86de879c: [AVR] Fix function pointer address space
Summary

Function pointers should be created with program address space.
This fixes function pointers on AVR.

Diff Detail

Event Timeline

vlastik created this revision.Mar 31 2020, 12:50 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 31 2020, 12:50 AM
Herald added subscribers: cfe-commits, Jim. · View Herald Transcript
vlastik updated this revision to Diff 253802.Mar 31 2020, 1:26 AM

Fix formatting

Harbormaster failed remote builds in B51094: Diff 253794!Mar 31 2020, 1:37 AM
dylanmckay accepted this revision.Mar 31 2020, 4:51 AM
This revision is now accepted and ready to land.Mar 31 2020, 4:51 AM
dylanmckay added a comment.Mar 31 2020, 4:52 AM

Nice work @vlastik, do you need someone to commit this for you?

vlastik added a comment.Mar 31 2020, 5:38 AM
In D77119#1952293, @dylanmckay wrote:

Nice work @vlastik, do you need someone to commit this for you?

Thanks, yes please I need someone to commit the patch

Closed by commit rG57fd86de879c: [AVR] Fix function pointer address space (authored by vlastik, committed by dylanmckay). · Explain WhyApr 1 2020, 1:37 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang/
lib/
CodeGen/
6 lines

Diff 253794

clang/lib/CodeGen/CodeGenTypes.cpp

Show First 20 Lines • Show All 589 Lines • ▼ Show 20 Lines case Type::RValueReference: {
break; break;
} }
case Type::Pointer: { case Type::Pointer: {
const PointerType *PTy = cast<PointerType>(Ty); const PointerType *PTy = cast<PointerType>(Ty);
QualType ETy = PTy->getPointeeType(); QualType ETy = PTy->getPointeeType();
llvm::Type *PointeeType = ConvertTypeForMem(ETy); llvm::Type *PointeeType = ConvertTypeForMem(ETy);
if (PointeeType->isVoidTy()) if (PointeeType->isVoidTy())
PointeeType = llvm::Type::getInt8Ty(getLLVMContext()); PointeeType = llvm::Type::getInt8Ty(getLLVMContext());
unsigned AS = Context.getTargetAddressSpace(ETy);
unsigned AS = PointeeType->isFunctionTy()
? getDataLayout().getProgramAddressSpace()
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-      ? getDataLayout().getProgramAddressSpace()
-      : Context.getTargetAddressSpace(ETy);
+                      ? getDataLayout().getProgramAddressSpace()
+                      : Context.getTargetAddressSpace(ETy);
Lint: Pre-merge checks: clang-format: please reformat the code ``` - ? getDataLayout().getProgramAddressSpace()…
: Context.getTargetAddressSpace(ETy);
ResultType = llvm::PointerType::get(PointeeType, AS); ResultType = llvm::PointerType::get(PointeeType, AS);
break; break;
} }
case Type::VariableArray: { case Type::VariableArray: {
const VariableArrayType *A = cast<VariableArrayType>(Ty); const VariableArrayType *A = cast<VariableArrayType>(Ty);
assert(A->getIndexTypeCVRQualifiers() == 0 && assert(A->getIndexTypeCVRQualifiers() == 0 &&
"FIXME: We only handle trivial array types so far!"); "FIXME: We only handle trivial array types so far!");
▲ Show 20 Lines • Show All 256 Lines • Show Last 20 Lines