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 #85954 from jckarter/sil-require-require-instruction

Browse Source 
SIL verifier: The `atInstruction`/`atArgument` parameter to `require` should not be optional.
This commit is contained in:
Joe Groff
2025-12-11 09:43:43 -08:00
committed by GitHub
parent f9fcd88298 da4e72cf2d
commit 560eb9deaa
3 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
SwiftCompilerSources/Sources/SIL/Utilities/Verifier.swift
View File

@@ -18,7 +18,7 @@ private protocol VerifiableInstruction : Instruction {
func verify(_ context: VerifierContext)
}
private func require(_ condition: Bool, _ message: @autoclosure () -> String, atInstruction: Instruction? = nil) {
private func require(_ condition: Bool, _ message: @autoclosure () -> String, atInstruction: Instruction) {
if !condition {
let msg = message()
msg._withBridgedStringRef { stringRef in
@@ -27,6 +27,15 @@ private func require(_ condition: Bool, _ message: @autoclosure () -> String, at
}
}
private func require(_ condition: Bool, _ message: @autoclosure () -> String, atArgument: Argument) {
if !condition {
let msg = message()
msg._withBridgedStringRef { stringRef in
BridgedVerifier.verifierError(stringRef, atArgument.bridged)
}
}
}
struct VerifierContext: Context {
let _bridged: BridgedContext
}
@@ -53,16 +62,21 @@ extension Function {
private extension Instruction {
func checkForwardingConformance() {
if bridged.shouldBeForwarding() {
require(self is ForwardingInstruction, "instruction \(self)\nshould conform to ForwardingInstruction")
require(self is ForwardingInstruction,
"instruction \(self)\nshould conform to ForwardingInstruction",
atInstruction: self)
} else {
require(!(self is ForwardingInstruction), "instruction \(self)\nshould not conform to ForwardingInstruction")
require(!(self is ForwardingInstruction),
"instruction \(self)\nshould not conform to ForwardingInstruction",
atInstruction: self)
}
}
func checkGuaranteedResults() {
for result in results where result.ownership == .guaranteed {
require(BeginBorrowValue(result) != nil || self is ForwardingInstruction || result.isGuaranteedApplyResult,
"\(result) must either be a BeginBorrowValue or a ForwardingInstruction")
"\(result) must either be a BeginBorrowValue or a ForwardingInstruction",
atInstruction: self)
}
}
}
@@ -89,14 +103,17 @@ private extension Phi {
var forwardingBorrowedFromFound = false
for use in value.uses {
require(use.instruction is BorrowedFromInst,
"guaranteed phi: \(self)\n has non borrowed-from use: \(use)")
"guaranteed phi: \(self)\n has non borrowed-from use: \(use)",
atArgument: self.value)
if use.index == 0 {
require(!forwardingBorrowedFromFound, "phi \(self) has multiple forwarding borrowed-from uses")
require(!forwardingBorrowedFromFound, "phi \(self) has multiple forwarding borrowed-from uses",
atArgument: self.value)
forwardingBorrowedFromFound = true
}
}
require(forwardingBorrowedFromFound,
"missing forwarding borrowed-from user of guaranteed phi \(self)")
"missing forwarding borrowed-from user of guaranteed phi \(self)",
atArgument: self.value)
}
}
@@ -104,7 +121,9 @@ extension BorrowedFromInst : VerifiableInstruction {
func verify(_ context: VerifierContext) {
for ev in enclosingValues {
require(ev.isValidEnclosingValueInBorrowedFrom, "invalid enclosing value in borrowed-from: \(ev)")
require(ev.isValidEnclosingValueInBorrowedFrom,
"invalid enclosing value in borrowed-from: \(ev)",
atInstruction: self)
}
var computedEVs = Stack<Value>(context)
@@ -120,7 +139,8 @@ extension BorrowedFromInst : VerifiableInstruction {
for computedEV in computedEVs {
require(existingEVs.contains(computedEV),
"\(computedEV)\n missing in enclosing values of \(self)")
"\(computedEV)\n missing in enclosing values of \(self)",
atInstruction: self)
}
}
}
@@ -189,10 +209,12 @@ extension BeginAccessInst : VerifiableInstruction {
extension VectorBaseAddrInst : VerifiableInstruction {
func verify(_ context: VerifierContext) {
require(vector.type.isBuiltinFixedArray,
"vector operand of vector_element_addr must be a Builtin.FixedArray")
"vector operand of vector_element_addr must be a Builtin.FixedArray",
atInstruction: self)
require(type == vector.type.builtinFixedArrayElementType(in: parentFunction,
maximallyAbstracted: true).addressType,
"result of vector_element_addr has wrong type")
"result of vector_element_addr has wrong type",
atInstruction: self)
}
}
@@ -235,7 +257,8 @@ private struct MutatingUsesWalker : AddressDefUseWalker {
if let bf = phi.borrowedFrom {
linearLiveranges.pushIfNotVisited(bf)
} else {
require(false, "missing borrowed-from for \(phi.value)")
require(false, "missing borrowed-from for \(phi.value)",
atArgument: phi.value)
}
}
}

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

@@ -1629,11 +1629,11 @@ struct BridgedVerifier {
static void registerVerifier(VerifyFunctionFn verifyFunctionFn);
static void verifierError(BridgedStringRef message,
OptionalBridgedInstruction atInstruction);
BridgedInstruction atInstruction);
static void verifierError(BridgedStringRef message,
OptionalBridgedArgument atArgument);
BridgedArgument atArgument);
static void verifierError(BridgedStringRef message,
OptionalBridgedValue atValue);
BridgedValue atValue);
};
struct BridgedUtilities {

8
lib/SIL/Utils/SILBridging.cpp
View File

@@ -918,19 +918,19 @@ void BridgedVerifier::runSwiftFunctionVerification(SILFunction * _Nonnull f, SIL
}
void BridgedVerifier::verifierError(BridgedStringRef message,
OptionalBridgedInstruction atInstruction) {
BridgedInstruction atInstruction) {
verificationFailure(message.unbridged(), atInstruction.unbridged(),
/*extraContext=*/nullptr);
}
void BridgedVerifier::verifierError(BridgedStringRef message,
OptionalBridgedArgument atArgument) {
verificationFailure(message.unbridged(), atArgument.unbridged(),
BridgedArgument atArgument) {
verificationFailure(message.unbridged(), atArgument.getArgument(),
/*extraContext=*/nullptr);
}
void BridgedVerifier::verifierError(BridgedStringRef message,
OptionalBridgedValue atValue) {
BridgedValue atValue) {
verificationFailure(message.unbridged(), SILValue(atValue.getSILValue()),
/*extraContext=*/nullptr);
}