diff --git a/llvm/lib/Demangle/MicrosoftDemangle.cpp b/llvm/lib/Demangle/MicrosoftDemangle.cpp
diff --git a/llvm/lib/Demangle/MicrosoftDemangleNodes.cpp b/llvm/lib/Demangle/MicrosoftDemangleNodes.cpp
diff --git a/llvm/lib/Demangle/MicrosoftDemangleNodes.h b/llvm/lib/Demangle/MicrosoftDemangleNodes.h
diff --git a/llvm/test/Demangle/ms-basic.test b/llvm/test/Demangle/ms-basic.test
@@ -65,15 +65,12 @@
 ?x@@3PEATty@@EA
 ; CHECK: union ty *x
 
-?x@@3PEAUty@@EA
-; CHECK: struct ty *x
+?x@@3PEAVty@@EA
+; CHECK: class ty *x
 
 ?x@@3PEAW4ty@@EA
 ; CHECK: enum ty *x
 
-?x@@3PEAVty@@EA
-; CHECK: class ty *x
-
 ?x@@3PEAV?$tmpl@H@@EA
 ; CHECK: class tmpl<int> *x
 

diff --git a/llvm/test/Demangle/ms-operators.test b/llvm/test/Demangle/ms-operators.test
@@ -219,10 +219,10 @@
 ; CHECK: const Base::`RTTI Complete Object Locator'
 
 ??__EFoo@@YAXXZ
-void __cdecl `dynamic initializer for 'Foo''(void)
+; CHECK: void __cdecl `dynamic initializer for 'Foo''(void)
 
 ??__FFoo@@YAXXZ
-void __cdecl `dynamic atexit destructor for 'Foo''(void)
+; CHECK: void __cdecl `dynamic atexit destructor for 'Foo''(void)
 
 ??__K_deg@@YAHO@Z
 ; CHECK: int __cdecl operator ""_deg(long double)

diff --git a/llvm/test/Demangle/ms-templates-memptrs-2.test b/llvm/test/Demangle/ms-templates-memptrs-2.test
@@ -10,19 +10,19 @@
 ; CHECK: struct K<struct M, -1> m2
 
 ?n@@3U?$J@UN@@$HA@@@A
-; CHECK: struct J<struct N, nullptr> n
+; CHECK: struct J<struct N, {0}> n
 
 ?n2@@3U?$K@UN@@$0?0@@A
 ; CHECK: struct K<struct N, -1> n2
 
 ?o@@3U?$J@UO@@$IA@A@@@A
-; CHECK: struct J<struct O, nullptr> o
+; CHECK: struct J<struct O, {0, 0}> o
 
 ?o2@@3U?$K@UO@@$FA@?0@@A
 ; CHECK: struct K<struct O, {0, -1}> o2
 
 ?p@@3U?$J@UP@@$JA@A@?0@@A
-; CHECK: struct J<struct P, nullptr> p
+; CHECK: struct J<struct P, {0, 0, -1}> p
 
 ?p2@@3U?$K@UP@@$GA@A@?0@@A
 ; CHECK: struct K<struct P, {0, 0, -1}> p2

diff --git a/llvm/test/Demangle/ms-templates-memptrs.test b/llvm/test/Demangle/ms-templates-memptrs.test
@@ -2,21 +2,20 @@
 
 ; CHECK-NOT: Invalid mangled name
 
-; There's a back-referencing problem here
 ??$CallMethod@UC@NegativeNVOffset@@$I??_912@$BA@AEPPPPPPPM@A@@@YAXAAUC@NegativeNVOffset@@@Z
-; FIXME: void __cdecl CallMethod<struct NegativeNVOffset::C, {[thunk]: __thiscall NegativeNVOffset::C::`vcall'{0, {flat}}, 4294967292, 0}>(struct NegativeNVOffset::C &)
+; CHECK: void __cdecl CallMethod<struct NegativeNVOffset::C, {[thunk]: __thiscall NegativeNVOffset::C::`vcall'{0, {flat}}, 4294967292, 0}>(struct NegativeNVOffset::C &)
 
 ??$CallMethod@UM@@$0A@@@YAXAAUM@@@Z
 ; CHECK: void __cdecl CallMethod<struct M, 0>(struct M &)
 
 ??$CallMethod@UM@@$H??_91@$BA@AEA@@@YAXAAUM@@@Z
-; FIXME: void __cdecl CallMethod<struct M, {[thunk]: __thiscall M::`vcall'{0, {flat}}', 0}>(struct M &)
+; CHECK: void __cdecl CallMethod<struct M, {[thunk]: __thiscall M::`vcall'{0, {flat}}, 0}>(struct M &)
 
 ??$CallMethod@UM@@$H?f@1@QAEXXZA@@@YAXAAUM@@@Z
-; FIXME: void __cdecl CallMethod<struct M, {void __thiscall M::f(void), 0}>(struct M &)
+; CHECK: void __cdecl CallMethod<struct M, {void __thiscall M::f(void), 0}>(struct M &)
 
 ??$CallMethod@UO@@$H??_91@$BA@AE3@@YAXAAUO@@@Z
-; FIXME: void __cdecl CallMethod<struct O, {[thunk]: __thiscall O::`vcall'{0, {flat}}, 4}>(struct O &)
+; CHECK: void __cdecl CallMethod<struct O, {[thunk]: __thiscall O::`vcall'{0, {flat}}, 4}>(struct O &)
 
 ??$CallMethod@US@@$0A@@@YAXAAUS@@@Z
 ; CHECK: void __cdecl CallMethod<struct S, 0>(struct S &)