[llvm] b7cc3b1 - [Attributor][FIX] Avoid empty bin in AAPointerInfo
Johannes Doerfert via llvm-commits
llvm-commits at lists.llvm.org
Tue Jun 21 19:31:34 PDT 2022
Author: Johannes Doerfert
Date: 2022-06-21T21:30:57-05:00
New Revision: b7cc3b10c549f6648a267a3ebc5171c42cdcecc5
URL: https://github.com/llvm/llvm-project/commit/b7cc3b10c549f6648a267a3ebc5171c42cdcecc5
DIFF: https://github.com/llvm/llvm-project/commit/b7cc3b10c549f6648a267a3ebc5171c42cdcecc5.diff
LOG: [Attributor][FIX] Avoid empty bin in AAPointerInfo
This avoid creating empty bins in AAPointerInfo which can lead to
segfaults. Also ensure we do not try to translate from callee to caller
except if we really take the argument state and move it to the call site
argument state.
Fixes: https://github.com/llvm/llvm-project/issues/55726
Added:
llvm/test/Transforms/Attributor/pointer-info.ll
Modified:
llvm/lib/Transforms/IPO/AttributorAttributes.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Transforms/IPO/AttributorAttributes.cpp b/llvm/lib/Transforms/IPO/AttributorAttributes.cpp
index 2d8f8f212ad0a..b36c712cdd6c8 100644
--- a/llvm/lib/Transforms/IPO/AttributorAttributes.cpp
+++ b/llvm/lib/Transforms/IPO/AttributorAttributes.cpp
@@ -1272,33 +1272,36 @@ struct AAPointerInfoImpl
return true;
}
- ChangeStatus translateAndAddCalleeState(Attributor &A,
- const AAPointerInfo &CalleeAA,
- int64_t CallArgOffset, CallBase &CB) {
+ ChangeStatus translateAndAddState(Attributor &A, const AAPointerInfo &OtherAA,
+ int64_t Offset, CallBase &CB,
+ bool FromCallee = false) {
using namespace AA::PointerInfo;
- if (!CalleeAA.getState().isValidState() || !isValidState())
+ if (!OtherAA.getState().isValidState() || !isValidState())
return indicatePessimisticFixpoint();
- const auto &CalleeImplAA = static_cast<const AAPointerInfoImpl &>(CalleeAA);
- bool IsByval = CalleeImplAA.getAssociatedArgument()->hasByValAttr();
+ const auto &OtherAAImpl = static_cast<const AAPointerInfoImpl &>(OtherAA);
+ bool IsByval =
+ FromCallee && OtherAAImpl.getAssociatedArgument()->hasByValAttr();
// Combine the accesses bin by bin.
ChangeStatus Changed = ChangeStatus::UNCHANGED;
- for (auto &It : CalleeImplAA.getState()) {
+ for (auto &It : OtherAAImpl.getState()) {
OffsetAndSize OAS = OffsetAndSize::getUnknown();
- if (CallArgOffset != OffsetAndSize::Unknown)
- OAS = OffsetAndSize(It.first.getOffset() + CallArgOffset,
- It.first.getSize());
- Accesses *Bin = AccessBins[OAS];
+ if (Offset != OffsetAndSize::Unknown)
+ OAS = OffsetAndSize(It.first.getOffset() + Offset, It.first.getSize());
+ Accesses *Bin = AccessBins.lookup(OAS);
for (const AAPointerInfo::Access &RAcc : *It.second) {
if (IsByval && !RAcc.isRead())
continue;
bool UsedAssumedInformation = false;
- Optional<Value *> Content = A.translateArgumentToCallSiteContent(
- RAcc.getContent(), CB, *this, UsedAssumedInformation);
- AccessKind AK =
- AccessKind(RAcc.getKind() & (IsByval ? AccessKind::AK_READ
- : AccessKind::AK_READ_WRITE));
+ AccessKind AK = RAcc.getKind();
+ Optional<Value *> Content = RAcc.getContent();
+ if (FromCallee) {
+ Content = A.translateArgumentToCallSiteContent(
+ RAcc.getContent(), CB, *this, UsedAssumedInformation);
+ AK = AccessKind(
+ AK & (IsByval ? AccessKind::AK_READ : AccessKind::AK_READ_WRITE));
+ }
Changed =
Changed | addAccess(A, OAS.getOffset(), OAS.getSize(), CB, Content,
AK, RAcc.getType(), RAcc.getRemoteInst(), Bin);
@@ -1493,8 +1496,8 @@ struct AAPointerInfoFloating : public AAPointerInfoImpl {
const auto &CSArgPI = A.getAAFor<AAPointerInfo>(
*this, IRPosition::callsite_argument(*CB, ArgNo),
DepClassTy::REQUIRED);
- Changed = translateAndAddCalleeState(
- A, CSArgPI, OffsetInfoMap[CurPtr].Offset, *CB) |
+ Changed = translateAndAddState(A, CSArgPI,
+ OffsetInfoMap[CurPtr].Offset, *CB) |
Changed;
return true;
}
@@ -1623,7 +1626,8 @@ struct AAPointerInfoCallSiteArgument final : AAPointerInfoFloating {
const IRPosition &ArgPos = IRPosition::argument(*Arg);
auto &ArgAA =
A.getAAFor<AAPointerInfo>(*this, ArgPos, DepClassTy::REQUIRED);
- return translateAndAddCalleeState(A, ArgAA, 0, *cast<CallBase>(getCtxI()));
+ return translateAndAddState(A, ArgAA, 0, *cast<CallBase>(getCtxI()),
+ /* FromCallee */ true);
}
/// See AbstractAttribute::trackStatistics()
diff --git a/llvm/test/Transforms/Attributor/pointer-info.ll b/llvm/test/Transforms/Attributor/pointer-info.ll
new file mode 100644
index 0000000000000..73b6016afed0f
--- /dev/null
+++ b/llvm/test/Transforms/Attributor/pointer-info.ll
@@ -0,0 +1,67 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --function-signature --check-attributes --check-globals
+; RUN: opt -attributor -enable-new-pm=0 -attributor-manifest-internal -attributor-max-iterations-verify -attributor-annotate-decl-cs -attributor-max-iterations=2 -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_CGSCC_NPM,NOT_CGSCC_OPM,NOT_TUNIT_NPM,IS__TUNIT____,IS________OPM,IS__TUNIT_OPM
+; RUN: opt -aa-pipeline=basic-aa -passes=attributor -attributor-manifest-internal -attributor-max-iterations-verify -attributor-annotate-decl-cs -attributor-max-iterations=2 -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_CGSCC_OPM,NOT_CGSCC_NPM,NOT_TUNIT_OPM,IS__TUNIT____,IS________NPM,IS__TUNIT_NPM
+; RUN: opt -attributor-cgscc -enable-new-pm=0 -attributor-manifest-internal -attributor-annotate-decl-cs -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_TUNIT_NPM,NOT_TUNIT_OPM,NOT_CGSCC_NPM,IS__CGSCC____,IS________OPM,IS__CGSCC_OPM
+; RUN: opt -aa-pipeline=basic-aa -passes=attributor-cgscc -attributor-manifest-internal -attributor-annotate-decl-cs -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_TUNIT_NPM,NOT_TUNIT_OPM,NOT_CGSCC_OPM,IS__CGSCC____,IS________NPM,IS__CGSCC_NPM
+
+%struct.test.b = type { i32, i32 }
+%struct.test.a = type { %struct.test.b, i32, i8*}
+
+define void @foo(i8* %ptr) {
+; IS__TUNIT____: Function Attrs: nofree norecurse nosync nounwind readnone willreturn
+; IS__TUNIT____-LABEL: define {{[^@]+}}@foo
+; IS__TUNIT____-SAME: (i8* nocapture nofree readnone [[PTR:%.*]]) #[[ATTR0:[0-9]+]] {
+; IS__TUNIT____-NEXT: entry:
+; IS__TUNIT____-NEXT: [[TMP0:%.*]] = alloca [[STRUCT_TEST_A:%.*]], align 8
+; IS__TUNIT____-NEXT: br label [[CALL_BR:%.*]]
+; IS__TUNIT____: call.br:
+; IS__TUNIT____-NEXT: [[TMP1:%.*]] = getelementptr inbounds [[STRUCT_TEST_A]], %struct.test.a* [[TMP0]], i64 0, i32 2
+; IS__TUNIT____-NEXT: tail call void @bar(%struct.test.a* noalias nocapture nofree noundef nonnull readonly byval([[STRUCT_TEST_A]]) align 8 dereferenceable(24) [[TMP0]]) #[[ATTR2:[0-9]+]]
+; IS__TUNIT____-NEXT: ret void
+;
+; IS__CGSCC____: Function Attrs: nofree nosync nounwind readnone willreturn
+; IS__CGSCC____-LABEL: define {{[^@]+}}@foo
+; IS__CGSCC____-SAME: (i8* nocapture nofree writeonly [[PTR:%.*]]) #[[ATTR0:[0-9]+]] {
+; IS__CGSCC____-NEXT: entry:
+; IS__CGSCC____-NEXT: [[TMP0:%.*]] = alloca [[STRUCT_TEST_A:%.*]], align 8
+; IS__CGSCC____-NEXT: br label [[CALL_BR:%.*]]
+; IS__CGSCC____: call.br:
+; IS__CGSCC____-NEXT: [[TMP1:%.*]] = getelementptr inbounds [[STRUCT_TEST_A]], %struct.test.a* [[TMP0]], i64 0, i32 2
+; IS__CGSCC____-NEXT: store i8* [[PTR]], i8** [[TMP1]], align 8
+; IS__CGSCC____-NEXT: tail call void @bar(%struct.test.a* noalias nocapture nofree noundef nonnull readnone byval([[STRUCT_TEST_A]]) align 8 dereferenceable(24) [[TMP0]]) #[[ATTR2:[0-9]+]]
+; IS__CGSCC____-NEXT: ret void
+;
+entry:
+ %0 = alloca %struct.test.a, align 8
+ br label %call.br
+
+call.br:
+ %1 = getelementptr inbounds %struct.test.a, %struct.test.a* %0, i64 0, i32 2
+ store i8* %ptr, i8** %1
+ tail call void @bar(%struct.test.a* noundef byval(%struct.test.a) align 8 %0)
+ ret void
+}
+
+define void @bar(%struct.test.a* noundef byval(%struct.test.a) align 8 %dev) {
+; CHECK: Function Attrs: argmemonly nofree norecurse nosync nounwind willreturn writeonly
+; CHECK-LABEL: define {{[^@]+}}@bar
+; CHECK-SAME: (%struct.test.a* noalias nocapture nofree noundef nonnull writeonly byval([[STRUCT_TEST_A:%.*]]) align 8 dereferenceable(24) [[DEV:%.*]]) #[[ATTR1:[0-9]+]] {
+; CHECK-NEXT: [[TMP1:%.*]] = getelementptr inbounds [[STRUCT_TEST_A]], %struct.test.a* [[DEV]], i64 0, i32 0
+; CHECK-NEXT: [[TMP2:%.*]] = getelementptr inbounds [[STRUCT_TEST_B:%.*]], %struct.test.b* [[TMP1]], i64 0, i32 1
+; CHECK-NEXT: store i32 1, i32* [[TMP2]], align 4
+; CHECK-NEXT: ret void
+;
+ %1 = getelementptr inbounds %struct.test.a, %struct.test.a* %dev, i64 0, i32 0
+ %2 = getelementptr inbounds %struct.test.b, %struct.test.b* %1, i64 0, i32 1
+ store i32 1, i32* %2
+ ret void
+}
+;.
+; IS__TUNIT____: attributes #[[ATTR0]] = { nofree norecurse nosync nounwind readnone willreturn }
+; IS__TUNIT____: attributes #[[ATTR1]] = { argmemonly nofree norecurse nosync nounwind willreturn writeonly }
+; IS__TUNIT____: attributes #[[ATTR2]] = { nofree nosync nounwind willreturn writeonly }
+;.
+; IS__CGSCC____: attributes #[[ATTR0]] = { nofree nosync nounwind readnone willreturn }
+; IS__CGSCC____: attributes #[[ATTR1]] = { argmemonly nofree norecurse nosync nounwind willreturn writeonly }
+; IS__CGSCC____: attributes #[[ATTR2]] = { nounwind willreturn writeonly }
+;.
More information about the llvm-commits
mailing list