commit 17ffbd03695a590d1c513010b7d4e96b9d5fe7d9
author David Majnemer <david.majnemer@gmail.com> Fri Aug 09 05:56:24 2013 +0000
committer David Majnemer <david.majnemer@gmail.com> Fri Aug 09 05:56:24 2013 +0000
tree 5d4e55e6fb8f6eb45285afb5a101a8b0db4aecfb
parent ea3db97495b4a657bff505cd06b71e53ced46805

Revert "[-cxx-abi microsoft] Mangle UUIDs correctly, stick them in the proper section"

This commit reverts r188053.

It is breaking the build bots.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@188055 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AST/MicrosoftMangle.cpp

diff --git a/lib/AST/MicrosoftMangle.cpp b/lib/AST/MicrosoftMangle.cpp
index 45d60c6..8d7b76d 100644
--- a/lib/AST/MicrosoftMangle.cpp
+++ b/lib/AST/MicrosoftMangle.cpp
@@ -317,7 +317,10 @@
   // mangled as 'QAHA' instead of 'PAHB', for example.
   TypeLoc TL = VD->getTypeSourceInfo()->getTypeLoc();
   QualType Ty = TL.getType();
-  if (const ArrayType *AT = getASTContext().getAsArrayType(Ty)) {
+  if (Ty->isPointerType() || Ty->isReferenceType()) {
+    mangleType(Ty, TL.getSourceRange(), QMM_Drop);
+    mangleQualifiers(Ty->getPointeeType().getQualifiers(), false);
+  } else if (const ArrayType *AT = getASTContext().getAsArrayType(Ty)) {
     // Global arrays are funny, too.
     mangleDecayedArrayType(AT, true);
     if (AT->getElementType()->isArrayType())