Fix a crash in llvm-undname with invalid types.

Zachary Turner · Zachary Turner · commit 2cd3286ed205 · 2018-12-14T17:43:56.000Z
llvm-svn: 349165
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -1669,10 +1669,10 @@ TypeNode *Demangler::demangleType(StringView &MangledName,`
`1669`	`1669`	`Ty = demangleCustomType(MangledName);`
`1670`	`1670`	`} else {`
`1671`	`1671`	`Ty = demanglePrimitiveType(MangledName);`
`1672`		`- if (!Ty \|\| Error)`
`1673`		`- return Ty;`
`1674`	`1672`	`}`
`1675`	`1673`
	`1674`	`+ if (!Ty \|\| Error)`
	`1675`	`+ return Ty;`
`1676`	`1676`	`Ty->Quals = Qualifiers(Ty->Quals \| Quals);`
`1677`	`1677`	`return Ty;`
`1678`	`1678`	`}`