[BoundsSafety] Do not merge param/return types if there is no need to #10873
Conversation
|
@swift-ci test llvm |
| @@ -4101,12 +4101,33 @@ static bool mergeFunctionDeclBoundsAttributes(FunctionDecl *New, | |||
| } | |||
| return MergeTy; | |||
| }; | |||
|
|
|||
| auto hasBoundsAttributesAtAnyLevel = [](QualType Ty) -> bool { | |||
| while (Ty->isPointerType()) { | |||
There was a problem hiding this comment.
I can't remember if void foo(int arr[__counted_by(len)], int len); decays to a pointer type immediately, or if the function declaration has a parameter with type CountAttributedType(IncompleteArrayType). Could you check that this function handles this?
There was a problem hiding this comment.
Does it walk through pointers enclosed by "Atomic" types?
There was a problem hiding this comment.
I can't remember if
void foo(int arr[__counted_by(len)], int len);decays to a pointer type immediately, or if the function declaration has a parameter with typeCountAttributedType(IncompleteArrayType). Could you check that this function handles this?
Yes, it does decay before this code is invoked. I added a test.
There was a problem hiding this comment.
Does it walk through pointers enclosed by "Atomic" types?
It does not. It shouldn't change the behavior, since ASTContext::mergeBoundsSafetyPointerTypes does not walk through _Atomic types too:
QualType ASTContext::mergeBoundsSafetyPointerTypes(
QualType DstTy, QualType SrcTy,
std::function<QualType(QualType /* DstTy */, QualType /* SrcTy */,
QualType /* MergePointeeTy */,
QualType /* OrigDstTy */)> &MergeFunctor,
QualType OrigDstTy) {
if (!DstTy->isPointerType())
return DstTy;If pointers don't have any interesting attributes, there is no need to attempt to merge the types, and we can keep the type unchanged. This will let us keep the sugars used in the new declaration. rdar://153579566
e6621b4 to
a6c3623
Compare
If pointers don't have any interesting attributes, there is no need to attempt to merge the types, and we can keep the type unchanged. This will let us keep the sugars used in the new declaration.
rdar://153579566