diff --git a/validation-test/IDE/crashers/488be7ca295930f4.swift b/validation-test/IDE/crashers/488be7ca295930f4.swift
index ced89073a1dcb..d815f97698eb1 100644
--- a/validation-test/IDE/crashers/488be7ca295930f4.swift
+++ b/validation-test/IDE/crashers/488be7ca295930f4.swift
@@ -1,5 +1,4 @@
-// {"kind":"complete","signature":"doPrintTypeInterface(swift::CompilerInvocation const&, llvm::StringRef, llvm::StringRef)"}
-// Actual signature: checkSingleOverride
+// {"kind":"complete","signature":"doPrintTypeInterface(swift::CompilerInvocation const&, llvm::StringRef, llvm::StringRef)","aliases":["checkSingleOverride(swift::ValueDecl*, swift::ValueDecl*)"]}
 // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
 class a { subscript(a) a { set } class b : a { override subscript(a) a {
 #^COMPLETE^#
diff --git a/validation-test/IDE/crashers/64cbd48634eb9eac.swift b/validation-test/IDE/crashers/64cbd48634eb9eac.swift
index 80d4ec7d9cd99..4c35f2379c5e1 100644
--- a/validation-test/IDE/crashers/64cbd48634eb9eac.swift
+++ b/validation-test/IDE/crashers/64cbd48634eb9eac.swift
@@ -1,4 +1,3 @@
-// {"kind":"complete","signature":"swift::irgen::IRGenModule::emitLazyObjCProtocolDefinition(swift::ProtocolDecl*)"}
-// Actual signature: matchCallArguments
+// {"kind":"complete","signature":"swift::irgen::IRGenModule::emitLazyObjCProtocolDefinition(swift::ProtocolDecl*)","aliases":["swift::constraints::ConstraintSystem::getType(swift::ASTNode) const"]}
 // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -code-completion-diagnostics -source-filename %s
 { switch { case let c(#^COMPLETE^# b) a
diff --git a/validation-test/IDE/crashers/8659dc98be5856f6.swift b/validation-test/IDE/crashers/8659dc98be5856f6.swift
index 2f10d4118da04..e2a6779d63917 100644
--- a/validation-test/IDE/crashers/8659dc98be5856f6.swift
+++ b/validation-test/IDE/crashers/8659dc98be5856f6.swift
@@ -1,4 +1,4 @@
-// {"kind":"complete","signature":"swift::ASTVisitor<(anonymous namespace)::StmtChecker, void, swift::Stmt*, void, void, void, void>::visit(swift::Stmt*)"}
-// RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -code-completion-diagnostics -source-filename %s
+// {"kind":"complete","signature":"bool (anonymous namespace)::StmtChecker::typeCheckStmt<swift::Stmt>(swift::Stmt*&)"}
+// RUN: not --crash %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
 extension {
 a { discard b#^COMPLETE^#
diff --git a/validation-test/IDE/crashers/8668a3eb11f2baf.swift b/validation-test/IDE/crashers/8668a3eb11f2baf.swift
index f9b643f4825df..d06c8ec3cda29 100644
--- a/validation-test/IDE/crashers/8668a3eb11f2baf.swift
+++ b/validation-test/IDE/crashers/8668a3eb11f2baf.swift
@@ -1,5 +1,4 @@
-// {"kind":"complete","signature":"swift::Demangle::RemanglerBase::entryForNode(swift::Demangle::Node*, bool)"}
-// Actual signature: USRBasedType::fromType
+// {"kind":"complete","signature":"swift::ide::USRBasedType::fromType(swift::Type, swift::ide::USRBasedTypeArena&)"}
 // RUN: not --crash %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
 protocol a: c {  b(a  = #^^# }
 protocol c: a
diff --git a/validation-test/IDE/crashers/88724bf42982b346.swift b/validation-test/IDE/crashers/88724bf42982b346.swift
index adc808185ae95..5183bde7454da 100644
--- a/validation-test/IDE/crashers/88724bf42982b346.swift
+++ b/validation-test/IDE/crashers/88724bf42982b346.swift
@@ -1,4 +1,3 @@
-// {"kind":"complete","signature":"swift::ide::printTypeUSR(swift::Type, llvm::raw_ostream&)"}
-// Actual signature: getContextSubstitutions
+// {"kind":"complete","signature":"swift::ide::printTypeUSR(swift::Type, llvm::raw_ostream&)","aliases":["swift::TypeBase::getContextSubstitutions(swift::DeclContext const*, swift::GenericEnvironment*)"]}
 // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
 protocol a extension a where Self == { extension a#^COMPLETE^# protocol b
diff --git a/validation-test/IDE/crashers/96faa1ddefcb57f.swift b/validation-test/IDE/crashers/96faa1ddefcb57f.swift
index 91e3e74e9e2c5..7c1ddac53c1b7 100644
--- a/validation-test/IDE/crashers/96faa1ddefcb57f.swift
+++ b/validation-test/IDE/crashers/96faa1ddefcb57f.swift
@@ -1,4 +1,3 @@
-// {"kind":"complete","signature":"swift::Demangle::ASTBuilder::findTypeDecl(swift::DeclContext*, swift::Identifier, swift::Identifier, swift::Demangle::Node::Kind)"}
-// Actual signature: openTypeParameter
+// {"kind":"complete","signature":"swift::Demangle::ASTBuilder::findTypeDecl(swift::DeclContext*, swift::Identifier, swift::Identifier, swift::Demangle::Node::Kind)","aliases":["openTypeParameter(swift::constraints::ConstraintSystem&, swift::Type, swift::GenericEnvironment*, llvm::DenseMap<swift::SubstitutableType*, swift::TypeVariableType*, llvm::DenseMapInfo<swift::SubstitutableType*, void>, llvm::detail::DenseMapPair<swift::SubstitutableType*, swift::TypeVariableType*>>&)"]}
 // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
 struct a<b:RangeReplaceableCollection where b ={ c: b.Element? { #^COMPLETE^#
diff --git a/validation-test/IDE/crashers/9b90cd875bff6ab4.swift b/validation-test/IDE/crashers/9b90cd875bff6ab4.swift
deleted file mode 100644
index 33447e4347e73..0000000000000
--- a/validation-test/IDE/crashers/9b90cd875bff6ab4.swift
+++ /dev/null
@@ -1,5 +0,0 @@
-// {"kind":"complete","signature":"(anonymous namespace)::Remangler::trySubstitution(swift::Demangle::Node*, swift::Demangle::SubstitutionEntry&, bool)"}
-// RUN: not --crash %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
-protocol a:c{ b(a=
-#^^#}
-protocol c:a
diff --git a/validation-test/IDE/crashers/acb013ae9149246.swift b/validation-test/IDE/crashers/acb013ae9149246.swift
index 6d4c21370b3d5..28783d8199988 100644
--- a/validation-test/IDE/crashers/acb013ae9149246.swift
+++ b/validation-test/IDE/crashers/acb013ae9149246.swift
@@ -1,5 +1,5 @@
-// {"kind":"complete","signature":"swift::DeclContext::getASTContext() const+0xbc"}
-// RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -code-completion-diagnostics -source-filename %s
+// {"kind":"complete","signature":"swift::DeclContext::getASTContext() const"}
+// RUN: not --crash %target-swift-ide-test -code-completion -batch-code-completion -skip-filecheck -code-completion-diagnostics -source-filename %s
 @ a(
 #^COMPLETE^# {}
 let b
diff --git a/validation-test/compiler_crashers_2/12d47ccfc65a990.swift b/validation-test/compiler_crashers_2/12d47ccfc65a990.swift
index 9c1c9f9eda85c..2f635e9670863 100644
--- a/validation-test/compiler_crashers_2/12d47ccfc65a990.swift
+++ b/validation-test/compiler_crashers_2/12d47ccfc65a990.swift
@@ -1,4 +1,4 @@
-// {"signature":"swift::ExtensionDecl::getExtendedNominal() const"}
+// {"kind":"typecheck","signature":"swift::ast_scope::ASTScopeImpl::printRange(llvm::raw_ostream&) const"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 extension a {}
 func b < >>
diff --git a/validation-test/compiler_crashers_2/21fbeea5d06bd55.swift b/validation-test/compiler_crashers_2/21fbeea5d06bd55.swift
index 837230115eb3f..74b33932f290a 100644
--- a/validation-test/compiler_crashers_2/21fbeea5d06bd55.swift
+++ b/validation-test/compiler_crashers_2/21fbeea5d06bd55.swift
@@ -1,4 +1,4 @@
-// {"signature":"std::__1::__function::__func<deriveBodyDecodable_enum_init(swift::AbstractFunctionDecl*, void*)::$_0, std::__1::allocator<deriveBodyDecodable_enum_init(swift::AbstractFunctionDecl*, void*)::$_0>, std::__1::tuple<swift::EnumElementDecl*, swift::BraceStmt*> (swift::EnumElementDecl*, swift::EnumElementDecl*, llvm::ArrayRef<swift::VarDecl*>)>::operator()(swift::EnumElementDecl*&&, swift::EnumElementDecl*&&, llvm::ArrayRef<swift::VarDecl*>&&)"}
+// {"kind":"typecheck","signature":"createEnumSwitch(swift::ASTContext&, swift::DeclContext*, swift::Expr*, swift::EnumDecl*, swift::EnumDecl*, bool, std::__1::function<std::__1::tuple<swift::EnumElementDecl*, swift::BraceStmt*> (swift::EnumElementDecl*, swift::EnumElementDecl*, llvm::ArrayRef<swift::VarDecl*>)>)"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 enum a : Codable { case x( x : Int b : Double enum XCodingKeys : CodingKey{
 x case x case b let c = a
diff --git a/validation-test/compiler_crashers_2/2571144ba4dfcd.swift b/validation-test/compiler_crashers_2/2571144ba4dfcd.swift
index c8769ee94fbf8..2f94c8131b4e6 100644
--- a/validation-test/compiler_crashers_2/2571144ba4dfcd.swift
+++ b/validation-test/compiler_crashers_2/2571144ba4dfcd.swift
@@ -1,4 +1,4 @@
-// {"signature":"swift::ASTPrinter::printName(swift::Identifier, swift::PrintNameContext, bool)"}
+// {"kind":"typecheck","signature":"(anonymous namespace)::TypePrinter::printWithParensIfNotSimple(swift::Type)"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 protocol a: Collection where Element == b.Element! {
   associatedtype b: Collection
diff --git a/validation-test/compiler_crashers_2/267b1378f37f8563.swift b/validation-test/compiler_crashers_2/267b1378f37f8563.swift
index 89e07bc37d764..0eac00c751009 100644
--- a/validation-test/compiler_crashers_2/267b1378f37f8563.swift
+++ b/validation-test/compiler_crashers_2/267b1378f37f8563.swift
@@ -1,4 +1,4 @@
-// {"signature":"swift::constraints::ArgumentMismatchFailure::diagnoseAttemptedRegexBuilder() const"}
+// {"kind":"typecheck","signature":"swift::constraints::AllowArgumentMismatch::create(swift::constraints::ConstraintSystem&, swift::Type, swift::Type, swift::constraints::ConstraintLocator*)"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 protocol b {
   c<each d >(repeat each d, e: (
diff --git a/validation-test/compiler_crashers_2/275b15e1edc79b4f.swift b/validation-test/compiler_crashers_2/275b15e1edc79b4f.swift
index bb989e7a35b24..e8b60be000348 100644
--- a/validation-test/compiler_crashers_2/275b15e1edc79b4f.swift
+++ b/validation-test/compiler_crashers_2/275b15e1edc79b4f.swift
@@ -1,4 +1,4 @@
-// {"signature":"swift::TypeTransform<(anonymous namespace)::TypeSubstituter>::doIt(swift::Type, swift::TypePosition)"}
+// {"kind":"typecheck","signature":"swift::ProtocolConformanceRef::getTypeWitness(swift::AssociatedTypeDecl*, swift::SubstOptions) const"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 protocol a: Collection where Iterator == Self
   struct b<c: a>: IteratorProtocol {next -> c.Element? struct c: a {
diff --git a/validation-test/compiler_crashers_2/2d564dafb1f91.swift b/validation-test/compiler_crashers_2/2d564dafb1f91.swift
index 9ab3720eae187..f11d0e65b7992 100644
--- a/validation-test/compiler_crashers_2/2d564dafb1f91.swift
+++ b/validation-test/compiler_crashers_2/2d564dafb1f91.swift
@@ -1,4 +1,4 @@
-// {"kind":"typecheck","signature":"swift::constraints::ConstraintSystem::getTypeOfMemberReference(swift::Type, swift::ValueDecl*, swift::DeclContext*, bool, swift::FunctionRefInfo, swift::constraints::ConstraintLocator*, llvm::SmallVectorImpl<std::__1::pair<swift::GenericTypeParamType*, swift::TypeVariableType*>>*, swift::constraints::PreparedOverload*)"}
+// {"kind":"typecheck","signature":"swift::constraints::ConstraintSystem::getTypeOfMemberReference(swift::Type, swift::ValueDecl*, swift::DeclContext*, bool, swift::FunctionRefInfo, swift::constraints::ConstraintLocator*, llvm::SmallVectorImpl<std::__1::pair<swift::GenericTypeParamType*, swift::TypeVariableType*>>*, swift::constraints::PreparedOverloadBuilder*)"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 class a {
   macro b()
diff --git a/validation-test/compiler_crashers_2/3070c3e372b52e7e.swift b/validation-test/compiler_crashers_2/3070c3e372b52e7e.swift
index 66aa39eeaef9e..186f7d4d81854 100644
--- a/validation-test/compiler_crashers_2/3070c3e372b52e7e.swift
+++ b/validation-test/compiler_crashers_2/3070c3e372b52e7e.swift
@@ -1,4 +1,4 @@
-// {"signature":"swift::constraints::ConstraintSystem::resolveOverload(swift::constraints::ConstraintLocator*, swift::Type, swift::constraints::OverloadChoice, swift::DeclContext*)"}
+// {"kind":"typecheck","signature":"swift::constraints::ConstraintSystem::recordResolvedOverload(swift::constraints::ConstraintLocator*, swift::constraints::SelectedOverload)"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 struct a func b(c : a) {
   {
diff --git a/validation-test/compiler_crashers_2/32bd25d0f0f96b1e.swift b/validation-test/compiler_crashers_2/32bd25d0f0f96b1e.swift
index 14474592d1641..dac016e0eb6d4 100644
--- a/validation-test/compiler_crashers_2/32bd25d0f0f96b1e.swift
+++ b/validation-test/compiler_crashers_2/32bd25d0f0f96b1e.swift
@@ -1,4 +1,4 @@
-// {"signature":"swift::constraints::ConstraintSystem::getTypeOfReference(swift::ValueDecl*, swift::FunctionRefInfo, swift::constraints::ConstraintLocatorBuilder, swift::DeclContext*)"}
+// {"kind":"typecheck","signature":"swift::constraints::ConstraintSystem::getTypeOfReference(swift::ValueDecl*, swift::FunctionRefInfo, swift::constraints::ConstraintLocatorBuilder, swift::DeclContext*, swift::constraints::PreparedOverloadBuilder*)"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 func a<b>((__shared b) -> Void)
 func c(UnsafeMutablePointer<UInt8>) a {
diff --git a/validation-test/compiler_crashers_2/3b24e8bed8732c5c.swift b/validation-test/compiler_crashers_2/3b24e8bed8732c5c.swift
index 5585e5965ab7a..b010e30dafe2d 100644
--- a/validation-test/compiler_crashers_2/3b24e8bed8732c5c.swift
+++ b/validation-test/compiler_crashers_2/3b24e8bed8732c5c.swift
@@ -1,4 +1,4 @@
-// {"kind":"emit-ir","signature":"std::__1::optional<swift::Type> llvm::function_ref<std::__1::optional<swift::Type> (swift::TypeBase*, swift::TypePosition)>::callback_fn<swift::rewriting::PropertyMap::getTypeFromSubstitutionSchema(swift::Type, llvm::ArrayRef<swift::rewriting::Term>, llvm::ArrayRef<swift::GenericTypeParamType*>, swift::rewriting::MutableTerm const&) const::$_0>(long, swift::TypeBase*, swift::TypePosition)"}
+// {"kind":"emit-ir","signature":"swift::irgen::FulfillmentMap::searchTypeMetadata(swift::irgen::IRGenModule&, swift::CanType, swift::irgen::IsExact_t, swift::MetadataState, unsigned int, swift::irgen::MetadataPath&&, swift::irgen::FulfillmentMap::InterestingKeysCallback const&)"}
 // RUN: not --crash %target-swift-frontend -emit-ir %s
 class a<b> {
 }
diff --git a/validation-test/compiler_crashers_2/624dafcf406667e8.swift b/validation-test/compiler_crashers_2/624dafcf406667e8.swift
index 3f24a29f92e73..8f4a7dcfb8f4e 100644
--- a/validation-test/compiler_crashers_2/624dafcf406667e8.swift
+++ b/validation-test/compiler_crashers_2/624dafcf406667e8.swift
@@ -1,4 +1,4 @@
-// {"signature":"(anonymous namespace)::SyntacticElementSolutionApplication::visitReturnStmt(swift::ReturnStmt*)"}
+// {"kind":"typecheck","signature":"(anonymous namespace)::SyntacticElementSolutionApplication::visitReturnStmt(swift::ReturnStmt*)"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 enum a func b(c : a) {
 let:
diff --git a/validation-test/compiler_crashers_2/666bd08556187ed3.swift b/validation-test/compiler_crashers_2/666bd08556187ed3.swift
index 60c91311ce31e..5a490918bcf2b 100644
--- a/validation-test/compiler_crashers_2/666bd08556187ed3.swift
+++ b/validation-test/compiler_crashers_2/666bd08556187ed3.swift
@@ -1,3 +1,3 @@
-// {"signature":"(anonymous namespace)::DeclChecker::visitExtensionDecl(swift::ExtensionDecl*)"}
+// {"kind":"typecheck","signature":"(anonymous namespace)::DeclChecker::visit(swift::Decl*)"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 extension repeat (
diff --git a/validation-test/compiler_crashers_2/66e337320b1924c.swift b/validation-test/compiler_crashers_2/66e337320b1924c.swift
index 84ec7ba65c3f7..664d90d82dabc 100644
--- a/validation-test/compiler_crashers_2/66e337320b1924c.swift
+++ b/validation-test/compiler_crashers_2/66e337320b1924c.swift
@@ -1,3 +1,3 @@
-// {"signature":"std::__1::__function::__func<resolveTypeWitnessViaLookup(swift::NormalProtocolConformance*, swift::AssociatedTypeDecl*)::$_3, std::__1::allocator<resolveTypeWitnessViaLookup(swift::NormalProtocolConformance*, swift::AssociatedTypeDecl*)::$_3>, void (swift::NormalProtocolConformance*)>::~__func()"}
+// {"kind":"typecheck","signature":"swift::ProtocolRequiresClassRequest::diagnoseCycle(swift::DiagnosticEngine&) const"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 struct b let b c a = b protocol a : a
diff --git a/validation-test/compiler_crashers_2/76b298dbdff34f1.swift b/validation-test/compiler_crashers_2/76b298dbdff34f1.swift
index ac2ad656d543a..02655fd5770cc 100644
--- a/validation-test/compiler_crashers_2/76b298dbdff34f1.swift
+++ b/validation-test/compiler_crashers_2/76b298dbdff34f1.swift
@@ -1,3 +1,3 @@
-// {"signature":"swift::TypeBase::getContextSubstitutions(swift::DeclContext const*, swift::GenericEnvironment*)"}
+// {"kind":"typecheck","signature":"swift::ide::printTypeUSR(swift::Type, llvm::raw_ostream&)"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 @propertyWrapper struct a < b { wrappedValue : c var projectedValue init(projectedValue d) func e(@a & f g : b
diff --git a/validation-test/compiler_crashers_2/9adf18151655a6ae.swift b/validation-test/compiler_crashers_2/9adf18151655a6ae.swift
index 062ad88089fc7..dd2fa785208a6 100644
--- a/validation-test/compiler_crashers_2/9adf18151655a6ae.swift
+++ b/validation-test/compiler_crashers_2/9adf18151655a6ae.swift
@@ -1,3 +1,3 @@
-// {"signature":"isVanishingTupleConformance(swift::NormalProtocolConformance*, swift::SubstitutionMap)"}
+// {"kind":"typecheck","signature":"(anonymous namespace)::DeclChecker::visit(swift::Decl*)"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 typealias a<b> = (repeat b)protocol c extension a : c
diff --git a/validation-test/compiler_crashers_2/b7d484d056661ff.swift b/validation-test/compiler_crashers_2/b7d484d056661ff.swift
index 1179d4c58a496..b2c8de0a6f072 100644
--- a/validation-test/compiler_crashers_2/b7d484d056661ff.swift
+++ b/validation-test/compiler_crashers_2/b7d484d056661ff.swift
@@ -1,3 +1,3 @@
-// {"signature":"swift::PackExpansionType::PackExpansionType(swift::Type, swift::Type, swift::RecursiveTypeProperties, swift::ASTContext const*)"}
+// {"kind":"typecheck","signature":"swift::TupleTypeElt::TupleTypeElt(swift::Type, swift::Identifier)"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 [Int : Int](Int) { a, b in a[b b= b * b
diff --git a/validation-test/compiler_crashers_2/b862de77602e6bcf.swift b/validation-test/compiler_crashers_2/b862de77602e6bcf.swift
index 7a815051554fb..c61bc07b8cf82 100644
--- a/validation-test/compiler_crashers_2/b862de77602e6bcf.swift
+++ b/validation-test/compiler_crashers_2/b862de77602e6bcf.swift
@@ -1,4 +1,5 @@
-// {"signature":"$s11swiftASTGen19addQueuedDiagnostic20queuedDiagnosticsPtr011perFrontende5StateH04text8severity4cLoc12categoryName17documentationPath015highlightRangesH0012numHighlightT013fixItsUntypedySv_SvSo16BridgedStringRefVSo0A0O0E4KindVSo0z6SourceN0VA2NSPySo0Z15CharSourceRangeVGSgSiSo0Z8ArrayRefVtF"}
+// {"kind":"typecheck","signature":"$s11swiftASTGen19addQueuedDiagnostic20queuedDiagnosticsPtr011perFrontende5StateH04text8severity3loc12categoryName17documentationPath015highlightRangesH0012numHighlightT013fixItsUntypedySv_SvSo16BridgedStringRefVSo0A0O0E4KindVAP9SourceLocVA2NSPyAP15CharSourceRangeVGSgSiSo0Z8ArrayRefVtF"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
+// REQUIRES: objc_interop
 // REQUIRES: swift_swift_parser
 class a { @objc ( : ( b
diff --git a/validation-test/compiler_crashers_2/c3b37ed583f2402b.swift b/validation-test/compiler_crashers_2/c3b37ed583f2402b.swift
index 96973c6c1980c..05d086da5f579 100644
--- a/validation-test/compiler_crashers_2/c3b37ed583f2402b.swift
+++ b/validation-test/compiler_crashers_2/c3b37ed583f2402b.swift
@@ -1,4 +1,4 @@
-// {"signature":"swift::TypeTransform<(anonymous namespace)::MapTypeIntoContext>::doIt(swift::Type, swift::TypePosition)"}
+// {"kind":"typecheck","signature":"(anonymous namespace)::IsBindableVisitor::handleGenericNominalType(swift::NominalTypeDecl*, swift::CanType, swift::CanType)"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 class a < b protocol
     c{associatedtype f : a<d> associatedtype d : a<f>} func e < b : c {
diff --git a/validation-test/compiler_crashers_2/d48b4d2e686349d.swift b/validation-test/compiler_crashers_2/d48b4d2e686349d.swift
index ae36428975d59..72b74f9991479 100644
--- a/validation-test/compiler_crashers_2/d48b4d2e686349d.swift
+++ b/validation-test/compiler_crashers_2/d48b4d2e686349d.swift
@@ -1,3 +1,3 @@
-// {"signature":"swift::constraints::ConstraintSystem::associateArgumentList(swift::constraints::ConstraintLocator*, swift::ArgumentList*)"}
+// {"kind":"typecheck","signature":"swift::constraints::ConstraintSystem::recordArgumentList(swift::constraints::ConstraintLocator*, swift::ArgumentList*)"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 protocol b let b = { (a : b)in switch a { case .c(d(
diff --git a/validation-test/compiler_crashers_2/db89d09981b453c7.swift b/validation-test/compiler_crashers_2/db89d09981b453c7.swift
index fe720518a1d2e..3501df15995b0 100644
--- a/validation-test/compiler_crashers_2/db89d09981b453c7.swift
+++ b/validation-test/compiler_crashers_2/db89d09981b453c7.swift
@@ -1,3 +1,3 @@
-// {"kind":"typecheck","original":"702452ac","signature":"std::__1::__function::__func<diagnoseProtocolStubFixit(swift::ASTContext&, swift::NormalProtocolConformance*, llvm::ArrayRef<swift::ASTContext::MissingWitness>)::$_0, std::__1::allocator<diagnoseProtocolStubFixit(swift::ASTContext&, swift::NormalProtocolConformance*, llvm::ArrayRef<swift::ASTContext::MissingWitness>)::$_0>, void (swift::NormalProtocolConformance*)>::operator()(swift::NormalProtocolConformance*&&)"}
+// {"kind":"typecheck","original":"702452ac","signature":"(anonymous namespace)::MultiConformanceChecker::checkAllConformances()"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 class a: b  protocol b { macro a
diff --git a/validation-test/compiler_crashers_2/e5dc6197d5ae06b.swift b/validation-test/compiler_crashers_2/e5dc6197d5ae06b.swift
index ba55958851c8f..7ba23339193b3 100644
--- a/validation-test/compiler_crashers_2/e5dc6197d5ae06b.swift
+++ b/validation-test/compiler_crashers_2/e5dc6197d5ae06b.swift
@@ -1,4 +1,4 @@
-// {"signature":"swift::QueryInterfaceTypeSubstitutions::operator()(swift::SubstitutableType*) const"}
+// {"kind":"typecheck","signature":"swift::Mangle::ASTMangler::appendRequirement(swift::Requirement const&, swift::GenericSignature, bool)"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 protocol a {
   typealias b = Int
diff --git a/validation-test/compiler_crashers_2/efd413faa5b859c9.swift b/validation-test/compiler_crashers_2/efd413faa5b859c9.swift
index 35ca9e656e49d..3a57150bf2a6b 100644
--- a/validation-test/compiler_crashers_2/efd413faa5b859c9.swift
+++ b/validation-test/compiler_crashers_2/efd413faa5b859c9.swift
@@ -1,3 +1,3 @@
-// {"signature":"swift::constraints::ConstraintSystem::recordOpenedTypes(swift::constraints::ConstraintLocatorBuilder, llvm::SmallVectorImpl<std::__1::pair<swift::GenericTypeParamType*, swift::TypeVariableType*>>&, bool)"}
+// {"kind":"typecheck","signature":"swift::constraints::ConstraintSystem::recordOpenedType(swift::constraints::ConstraintLocator*, llvm::ArrayRef<std::__1::pair<swift::GenericTypeParamType*, swift::TypeVariableType*>>, swift::constraints::PreparedOverloadBuilder*)"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 struct b let c = { (a : b)in switch a { case .d(... e
diff --git a/validation-test/compiler_crashers_2/f1419d3f3c2fe6b9.swift b/validation-test/compiler_crashers_2/f1419d3f3c2fe6b9.swift
index e61bb9fec6508..c37fc1783410f 100644
--- a/validation-test/compiler_crashers_2/f1419d3f3c2fe6b9.swift
+++ b/validation-test/compiler_crashers_2/f1419d3f3c2fe6b9.swift
@@ -1,4 +1,4 @@
-// {"signature":"(anonymous namespace)::TypeSubstituter::transformGenericTypeParamType(swift::GenericTypeParamType*, swift::TypePosition)"}
+// {"kind":"typecheck","signature":"swift::Mangle::ASTMangler::appendProtocolName(swift::ProtocolDecl const*, bool)"}
 // RUN: not --crash %target-swift-frontend -typecheck %s
 extension Collection where Self : a {
   struct Index protocol a