Skip to content

Commit 4aac329

Browse files
committed
Revert "[IRGen] Work around assertion in handling of keypaths into @objc protocols."
This reverts commit 9943b92. This was a 4.1-only workaround that came in via a merge to swift-5.0-branch. The workaround should no longer be needed since the 5.0 branch picked up the real fix from #13508.
1 parent 2e6c933 commit 4aac329

File tree

2 files changed

+1
-23
lines changed

2 files changed

+1
-23
lines changed

lib/IRGen/ProtocolInfo.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,7 @@ class ProtocolInfo final :
227227
if (witness.matchesFunction(function))
228228
return getNonBaseWitnessIndex(&witness);
229229
}
230-
231-
// FIXME: This should be an "unreachable", but Swift < 4.1 had an
232-
// existing bug here that depends on (effectively) getting this
233-
// result in non-Asserts builds. Emulate that behavior for now,
234-
// but only on the Swift 4.1 branch.
235-
return WitnessIndex(0, false);
230+
llvm_unreachable("didn't find entry for function");
236231
}
237232

238233
/// Return the witness index for the type metadata access function

validation-test/compiler_crashers_2_fixed/0135-rdar36111009.swift

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)