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

Merge pull request #78996 from aschwaighofer/checked_cast_br_nightmares

Browse Source 
SIL: Update formal source type in SimplifyRefCasts when possible
This commit is contained in:
Arnold Schwaighofer
2025-02-02 08:27:01 -08:00
committed by GitHub
parent 19d3987c43 0fe3cf0096
commit c95c45201e
9 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
SwiftCompilerSources/Sources/Optimizer/InstructionSimplification/SimplifyRefCasts.swift
View File

@@ -86,6 +86,13 @@ private extension UnaryInstruction {
operand.set(to: replacement, context)
}
if let ccb = self as? CheckedCastBranchInst {
// Make sure that updating the formal type with the operand type is
// legal.
if operand.value.type.isLegalFormalType {
ccb.updateSourceFormalTypeFromOperandLoweredType()
}
}
if canEraseInst {
context.erase(instructionIncludingDebugUses: inst)
}

4
SwiftCompilerSources/Sources/SIL/Instruction.swift
View File

@@ -1696,6 +1696,10 @@ final public class CheckedCastBranchInst : TermInst, UnaryInstruction {
public var source: Value { operand.value }
public var successBlock: BasicBlock { bridged.CheckedCastBranch_getSuccessBlock().block }
public var failureBlock: BasicBlock { bridged.CheckedCastBranch_getFailureBlock().block }
public func updateSourceFormalTypeFromOperandLoweredType() {
bridged.CheckedCastBranch_updateSourceFormalTypeFromOperandLoweredType()
}
}
final public class CheckedCastAddrBranchInst : TermInst {

2
SwiftCompilerSources/Sources/SIL/Type.swift
View File

@@ -104,6 +104,8 @@ public struct Type : CustomStringConvertible, NoReflectionChildren {
public var isBuiltinVector: Bool { bridged.isBuiltinVector() }
public var builtinVectorElementType: Type { bridged.getBuiltinVectorElementType().type }
public var isLegalFormalType: Bool { bridged.isLegalFormalType() }
public func isBuiltinInteger(withFixedWidth width: Int) -> Bool {
bridged.isBuiltinFixedWidthInteger(width)
}

2
include/swift/SIL/SILBridging.h
View File

@@ -277,6 +277,7 @@ struct BridgedType {
BRIDGED_INLINE bool isBuiltinInteger() const;
BRIDGED_INLINE bool isBuiltinFloat() const;
BRIDGED_INLINE bool isBuiltinVector() const;
BRIDGED_INLINE bool isLegalFormalType() const;
SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedType getBuiltinVectorElementType() const;
BRIDGED_INLINE bool isBuiltinFixedWidthInteger(SwiftInt width) const;
BRIDGED_INLINE bool isExactSuperclassOf(BridgedType t) const;
@@ -810,6 +811,7 @@ struct BridgedInstruction {
SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedBasicBlock CheckedCastBranch_getFailureBlock() const;
SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedBasicBlock CheckedCastAddrBranch_getSuccessBlock() const;
SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedBasicBlock CheckedCastAddrBranch_getFailureBlock() const;
BRIDGED_INLINE void CheckedCastBranch_updateSourceFormalTypeFromOperandLoweredType() const;
BRIDGED_INLINE CastConsumptionKind CheckedCastAddrBranch_getConsumptionKind() const;
SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedSubstitutionMap ApplySite_getSubstitutionMap() const;
SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedCanType ApplySite_getSubstitutedCalleeType() const;

8
include/swift/SIL/SILBridgingImpl.h
View File

@@ -445,6 +445,10 @@ bool BridgedType::isBuiltinVector() const {
return unbridged().isBuiltinVector();
}
bool BridgedType::isLegalFormalType() const {
return unbridged().getASTType()->isLegalFormalType();
}
BridgedType BridgedType::getBuiltinVectorElementType() const {
return unbridged().getBuiltinVectorElementType();
}
@@ -1504,6 +1508,10 @@ void BridgedInstruction::LoadInst_setOwnership(SwiftInt ownership) const {
getAs<swift::LoadInst>()->setOwnershipQualifier((swift::LoadOwnershipQualifier)ownership);
}
void BridgedInstruction::CheckedCastBranch_updateSourceFormalTypeFromOperandLoweredType() const {
getAs<swift::CheckedCastBranchInst>()->updateSourceFormalTypeFromOperandLoweredType();
}
BridgedBasicBlock BridgedInstruction::CheckedCastBranch_getSuccessBlock() const {
return {getAs<swift::CheckedCastBranchInst>()->getSuccessBB()};
}

4
include/swift/SIL/SILInstruction.h
View File

@@ -11032,6 +11032,10 @@ public:
SILType getSourceLoweredType() const { return getOperand()->getType(); }
CanType getSourceFormalType() const { return SrcFormalTy; }
void updateSourceFormalTypeFromOperandLoweredType() {
SrcFormalTy = getSourceLoweredType().getASTType();
}
SILType getTargetLoweredType() const { return DestLoweredTy; }
CanType getTargetFormalType() const { return DestFormalTy; }
};

2
test/DebugInfo/simplify_checked_cast_br.sil
View File

@@ -11,7 +11,7 @@ class X : B {}
// CHECK-LABEL: sil [ossa] @test_ossa :
// CHECK: %0 = alloc_ref
// CHECK-NEXT: checked_cast_br AnyObject in %0 : $X
// CHECK-NEXT: checked_cast_br X in %0 : $X
// CHECK: bb2([[A:%.*]] : @owned $X):
// CHECK-NEXT: [[U:%.*]] = upcast [[A]] : $X to $B, loc "takethis":1:1
// CHECK-NEXT: [[E:%.*]] = init_existential_ref [[U]] {{.+}}, loc "takethis":1:1

2
test/SILOptimizer/devirt_covariant_return.swift
View File

@@ -235,7 +235,7 @@ public class D2: D1 {
// that D2.foo() is inlined thanks to this.
// CHECK-LABEL: sil hidden [noinline] @$s23devirt_covariant_return7driver2ys5Int32VAA2D2CF
// CHECK-NOT: class_method
// CHECK: checked_cast_br [exact] D1 in
// CHECK: checked_cast_br [exact] D2 in
// CHECK: bb2
// CHECK: global_addr
// CHECK: load

6
test/SILOptimizer/simplify_checked_cast_br.sil
View File

@@ -12,7 +12,7 @@ class X : B {}
// CHECK-LABEL: sil @test_non_ossa :
// CHECK: %0 = alloc_ref
// CHECK: checked_cast_br AnyObject in %0 : $X
// CHECK: checked_cast_br X in %0 : $X
// CHECK: } // end sil function 'test_non_ossa'
sil @test_non_ossa : $@convention(thin) () -> AnyObject {
bb0:
@@ -31,7 +31,7 @@ bb2:
// CHECK-LABEL: sil [ossa] @test_ossa :
// CHECK: %0 = alloc_ref
// CHECK-O-NEXT: checked_cast_br AnyObject in %0 : $X
// CHECK-O-NEXT: checked_cast_br X in %0 : $X
// CHECK-ONONE: checked_cast_br AnyObject in %2 : $AnyObject
// CHECK-O: bb2([[A:%.*]] : @owned $X):
// CHECK-O-NEXT: [[U:%.*]] = upcast [[A]] : $X to $B
@@ -75,7 +75,7 @@ bb2(%7 : @owned $B):
// CHECK-LABEL: sil [ossa] @test_borrow :
// CHECK: %1 = begin_borrow
// CHECK-NEXT: checked_cast_br any P in %1 : $X
// CHECK-NEXT: checked_cast_br X in %1 : $X
// CHECK: bb2([[A:%.*]] : @guaranteed $X):
// CHECK-NEXT: [[U:%.*]] = upcast [[A]] : $X to $B
// CHECK-NEXT: [[E:%.*]] = init_existential_ref [[U]] : $B