aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/Demangle/MicrosoftDemangle.cpp
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2018-12-14 17:43:56 +0000
committerZachary Turner <zturner@google.com>2018-12-14 17:43:56 +0000
commit2cd3286ed205ad9452febff1fa1992e7d7968257 (patch)
treea077c4cecd21a4ac921928aa4eda2a0c3e7601ec /llvm/lib/Demangle/MicrosoftDemangle.cpp
parenta44dc32708af03809145cf998beef0b28549ad40 (diff)
downloadllvm-2cd3286ed205ad9452febff1fa1992e7d7968257.zip
llvm-2cd3286ed205ad9452febff1fa1992e7d7968257.tar.gz
llvm-2cd3286ed205ad9452febff1fa1992e7d7968257.tar.bz2
Fix a crash in llvm-undname with invalid types.
llvm-svn: 349165
Diffstat (limited to 'llvm/lib/Demangle/MicrosoftDemangle.cpp')
-rw-r--r--llvm/lib/Demangle/MicrosoftDemangle.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Demangle/MicrosoftDemangle.cpp b/llvm/lib/Demangle/MicrosoftDemangle.cpp
index 4a45bfa..c486652 100644
--- a/llvm/lib/Demangle/MicrosoftDemangle.cpp
+++ b/llvm/lib/Demangle/MicrosoftDemangle.cpp
@@ -1669,10 +1669,10 @@ TypeNode *Demangler::demangleType(StringView &MangledName,
Ty = demangleCustomType(MangledName);
} else {
Ty = demanglePrimitiveType(MangledName);
- if (!Ty || Error)
- return Ty;
}
+ if (!Ty || Error)
+ return Ty;
Ty->Quals = Qualifiers(Ty->Quals | Quals);
return Ty;
}