]> granicus.if.org Git - llvm/commitdiff
Fix a crash in llvm-undname with invalid types.
authorZachary Turner <zturner@google.com>
Fri, 14 Dec 2018 17:43:56 +0000 (17:43 +0000)
committerZachary Turner <zturner@google.com>
Fri, 14 Dec 2018 17:43:56 +0000 (17:43 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@349165 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Demangle/MicrosoftDemangle.cpp

index 4a45bfa8b32ef4fa1da4e2e81c36c7571dd5adea..c486652e7322ba16994e657521a467e90654329e 100644 (file)
@@ -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;
 }