averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

SIL: don't add effects attributes for storage decls.

Browse Source 
Only for accessor functions.
This is important because the clang importer sets "readonly" attributes for a getter also on the storage decl, which would propagate to the setter.

This PR restores the old behavior which was changed by https://github.com/apple/swift/pull/40957.

Unfortunately I don't have a test case.

rdar://88876417
This commit is contained in:
Erik Eckstein
2022-03-03 13:31:53 +01:00
parent adabdcbd2e
commit 08c05719e1
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/SIL/IR/SILFunctionBuilder.cpp
View File

@@ -101,17 +101,19 @@ void SILFunctionBuilder::addFunctionAttributes(
}
llvm::SmallVector<const EffectsAttr *, 8> customEffects;
for (auto *attr : Attrs.getAttributes<EffectsAttr>()) {
auto *effectsAttr = cast<EffectsAttr>(attr);
if (effectsAttr->getKind() == EffectsKind::Custom) {
customEffects.push_back(effectsAttr);
} else {
if (F->getEffectsKind() != EffectsKind::Unspecified &&
F->getEffectsKind() != effectsAttr->getKind()) {
mod.getASTContext().Diags.diagnose(effectsAttr->getLocation(),
diag::warning_in_effects_attribute, "mismatching function effects");
if (constant) {
for (auto *attr : Attrs.getAttributes<EffectsAttr>()) {
auto *effectsAttr = cast<EffectsAttr>(attr);
if (effectsAttr->getKind() == EffectsKind::Custom) {
customEffects.push_back(effectsAttr);
} else {
F->setEffectsKind(effectsAttr->getKind());
if (F->getEffectsKind() != EffectsKind::Unspecified &&
F->getEffectsKind() != effectsAttr->getKind()) {
mod.getASTContext().Diags.diagnose(effectsAttr->getLocation(),
diag::warning_in_effects_attribute, "mismatching function effects");
} else {
F->setEffectsKind(effectsAttr->getKind());
}
}
}
}