[llvm] r349165 - Fix a crash in llvm-undname with invalid types.

Zachary Turner via llvm-commits llvm-commits at lists.llvm.org
Fri Dec 14 09:43:56 PST 2018


Author: zturner
Date: Fri Dec 14 09:43:56 2018
New Revision: 349165

URL: http://llvm.org/viewvc/llvm-project?rev=349165&view=rev
Log:
Fix a crash in llvm-undname with invalid types.

Modified:
    llvm/trunk/lib/Demangle/MicrosoftDemangle.cpp

Modified: llvm/trunk/lib/Demangle/MicrosoftDemangle.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Demangle/MicrosoftDemangle.cpp?rev=349165&r1=349164&r2=349165&view=diff
==============================================================================
--- llvm/trunk/lib/Demangle/MicrosoftDemangle.cpp (original)
+++ llvm/trunk/lib/Demangle/MicrosoftDemangle.cpp Fri Dec 14 09:43:56 2018
@@ -1669,10 +1669,10 @@ TypeNode *Demangler::demangleType(String
     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;
 }




More information about the llvm-commits mailing list