diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2013-08-09 05:56:24 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2013-08-09 05:56:24 +0000 |
| commit | a2724ae4b381dc84a7ea450514f123ace0a5aa9a (patch) | |
| tree | 9bf01635e4a9703ce9192b9db4706c60d17bb6bb /clang/lib/AST/MicrosoftMangle.cpp | |
| parent | 215b00a66a2c3c91b8ca2abd258ac426a6d589c6 (diff) | |
| download | bcm5719-llvm-a2724ae4b381dc84a7ea450514f123ace0a5aa9a.tar.gz bcm5719-llvm-a2724ae4b381dc84a7ea450514f123ace0a5aa9a.zip | |
Revert "[-cxx-abi microsoft] Mangle UUIDs correctly, stick them in the proper section"
This commit reverts r188053.
It is breaking the build bots.
llvm-svn: 188055
Diffstat (limited to 'clang/lib/AST/MicrosoftMangle.cpp')
| -rw-r--r-- | clang/lib/AST/MicrosoftMangle.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/AST/MicrosoftMangle.cpp b/clang/lib/AST/MicrosoftMangle.cpp index 45d60c620ef..8d7b76db5e9 100644 --- a/clang/lib/AST/MicrosoftMangle.cpp +++ b/clang/lib/AST/MicrosoftMangle.cpp @@ -317,7 +317,10 @@ void MicrosoftCXXNameMangler::mangleVariableEncoding(const VarDecl *VD) { // 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()) |
