commit e4ddba241c5b60bb927cb671e5ce452538c2b14e
author Arnold Schwaighofer <aschwaighofer@apple.com> Fri Jul 13 06:27:27 2018 -0700
committer GitHub <noreply@github.com> Fri Jul 13 06:27:27 2018 -0700
tree 32bd70b525e645ef87b7fef62fd379baf4cee870
parent 9b78d53dae1e355430331cf45ac7cfe25ff91e5e
parent 0d44d09028582bdcc8ca7cfc22f3a9f8b027ca93

Merge pull request #17916 from aschwaighofer/fix_getSpecializedConformance_4.2

[4.2] ASTContext: Recompute the insert position in getSpecializedConformance after the SpecializedProtocolConformance constructor

lib/AST/ASTContext.cpp

diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index f31cf88..51dfea0 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -1871,6 +1871,9 @@
   auto result
     = new (*this, arena) SpecializedProtocolConformance(type, generic,
                                                         substitutions);
+  auto node = specializedConformances.FindNodeOrInsertPos(id, insertPos);
+  (void)node;
+  assert(!node);
   specializedConformances.InsertNode(result, insertPos);
   return result;
 }