Merge pull request #38198 from al45tair/fix-main-2021-07-01

[Demangler] Fix build breakage caused by merging two PRs that clashed.

Author: shahmishal

lib/Demangling/OldRemangler.cpp

@@ -1930,7 +1930,7 @@ void Remangler::mangleAnyNominalType(Node *node, EntityContext &ctx,
 
   switch (node->getKind()) {
   case Node::Kind::Type:
-    mangleAnyNominalType(node->getChild(0), ctx);
+    mangleAnyNominalType(node->getChild(0), ctx, depth + 1);
     break;
   case Node::Kind::OtherNominalType:
     // Mangle unknown type kinds as structures since we can't change the old