[PATCH] D32428: Fix for Itanium mangler issue with templates (bug: 31405)

[Phabricator via Phabricator via cfe-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL305377: Fix for Itanium mangler issue with templates (authored by dpolukhin).

Changed prior to commit:
  https://reviews.llvm.org/D32428?vs=96380&id=102509#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D32428

Files:
  cfe/trunk/lib/AST/ItaniumMangle.cpp


Index: cfe/trunk/lib/AST/ItaniumMangle.cpp
===================================================================
--- cfe/trunk/lib/AST/ItaniumMangle.cpp
+++ cfe/trunk/lib/AST/ItaniumMangle.cpp
@@ -4550,9 +4550,11 @@
 
   const FunctionProtoType *Proto =
       cast<FunctionProtoType>(FD->getType()->getAs<FunctionType>());
+  FunctionTypeDepthState saved = TrackReturnTypeTags.FunctionTypeDepth.push();
   TrackReturnTypeTags.FunctionTypeDepth.enterResultType();
   TrackReturnTypeTags.mangleType(Proto->getReturnType());
   TrackReturnTypeTags.FunctionTypeDepth.leaveResultType();
+  TrackReturnTypeTags.FunctionTypeDepth.pop(saved);
 
   return TrackReturnTypeTags.AbiTagsRoot.getSortedUniqueUsedAbiTags();
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D32428.102509.patch
Type: text/x-patch
Size: 711 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20170614/474753fa/attachment.bin>