[llvm] r338778 - [MS Demangler] Fix some tests that are no longer broken.
Zachary Turner via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 2 15:37:40 PDT 2018
Author: zturner
Date: Thu Aug 2 15:37:40 2018
New Revision: 338778
URL: http://llvm.org/viewvc/llvm-project?rev=338778&view=rev
Log:
[MS Demangler] Fix some tests that are no longer broken.
These were fixed with earlier patches, but had not yet been
re-enabled.
Modified:
llvm/trunk/test/Demangle/ms-arg-qualifiers.test
Modified: llvm/trunk/test/Demangle/ms-arg-qualifiers.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Demangle/ms-arg-qualifiers.test?rev=338778&r1=338777&r2=338778&view=diff
==============================================================================
--- llvm/trunk/test/Demangle/ms-arg-qualifiers.test (original)
+++ llvm/trunk/test/Demangle/ms-arg-qualifiers.test Thu Aug 2 15:37:40 2018
@@ -10,86 +10,107 @@
; CHECK: void __cdecl foo(double)
?foo_pad@@YAXPAD at Z
+; CHECK: void __cdecl foo_pad(char *)
?foo_pad@@YAXPEAD at Z
; CHECK: void __cdecl foo_pad(char *)
?foo_pbd@@YAXPBD at Z
+; CHECK: void __cdecl foo_pbd(char const *)
?foo_pbd@@YAXPEBD at Z
; CHECK: void __cdecl foo_pbd(char const *)
?foo_pcd@@YAXPCD at Z
+; CHECK: void __cdecl foo_pcd(char volatile *)
?foo_pcd@@YAXPECD at Z
; CHECK: void __cdecl foo_pcd(char volatile *)
?foo_qad@@YAXQAD at Z
+; CHECK: void __cdecl foo_qad(char *const)
?foo_qad@@YAXQEAD at Z
; CHECK: void __cdecl foo_qad(char *const)
?foo_rad@@YAXRAD at Z
+; CHECK: void __cdecl foo_rad(char *volatile)
?foo_rad@@YAXREAD at Z
; CHECK: void __cdecl foo_rad(char *volatile)
?foo_sad@@YAXSAD at Z
+; CHECK: void __cdecl foo_sad(char *const volatile)
?foo_sad@@YAXSEAD at Z
; CHECK: void __cdecl foo_sad(char *const volatile)
?foo_piad@@YAXPIAD at Z
+; CHECK: void __cdecl foo_piad(char *__restrict)
?foo_piad@@YAXPEIAD at Z
; CHECK: void __cdecl foo_piad(char *__restrict)
?foo_qiad@@YAXQIAD at Z
+; CHECK: void __cdecl foo_qiad(char *const __restrict)
?foo_qiad@@YAXQEIAD at Z
; CHECK: void __cdecl foo_qiad(char *const __restrict)
?foo_riad@@YAXRIAD at Z
+; CHECK: void __cdecl foo_riad(char *volatile __restrict)
?foo_riad@@YAXREIAD at Z
; CHECK: void __cdecl foo_riad(char *volatile __restrict)
?foo_siad@@YAXSIAD at Z
+; CHECK: void __cdecl foo_siad(char *const volatile __restrict)
?foo_siad@@YAXSEIAD at Z
; CHECK: void __cdecl foo_siad(char *const volatile __restrict)
?foo_papad@@YAXPAPAD at Z
+; CHECK: void __cdecl foo_papad(char **)
?foo_papad@@YAXPEAPEAD at Z
; CHECK: void __cdecl foo_papad(char **)
?foo_papbd@@YAXPAPBD at Z
+; CHECK: void __cdecl foo_papbd(char const **)
?foo_papbd@@YAXPEAPEBD at Z
; CHECK: void __cdecl foo_papbd(char const **)
?foo_papcd@@YAXPAPCD at Z
+; CHECK: void __cdecl foo_papcd(char volatile **)
?foo_papcd@@YAXPEAPECD at Z
; CHECK: void __cdecl foo_papcd(char volatile **)
?foo_pbqad@@YAXPBQAD at Z
+; CHECK: void __cdecl foo_pbqad(char *const *)
?foo_pbqad@@YAXPEBQEAD at Z
; CHECK: void __cdecl foo_pbqad(char *const *)
?foo_pcrad@@YAXPCRAD at Z
+; CHECK: void __cdecl foo_pcrad(char *volatile *)
?foo_pcrad@@YAXPECREAD at Z
; CHECK: void __cdecl foo_pcrad(char *volatile *)
?foo_qapad@@YAXQAPAD at Z
+; CHECK: void __cdecl foo_qapad(char **const)
?foo_qapad@@YAXQEAPEAD at Z
; CHECK: void __cdecl foo_qapad(char **const)
?foo_rapad@@YAXRAPAD at Z
+; CHECK: void __cdecl foo_rapad(char **volatile)
?foo_rapad@@YAXREAPEAD at Z
; CHECK: void __cdecl foo_rapad(char **volatile)
?foo_pbqbd@@YAXPBQBD at Z
+; CHECK: void __cdecl foo_pbqbd(char const *const *)
?foo_pbqbd@@YAXPEBQEBD at Z
; CHECK: void __cdecl foo_pbqbd(char const *const *)
?foo_pbqcd@@YAXPBQCD at Z
+; CHECK: void __cdecl foo_pbqcd(char volatile *const *)
?foo_pbqcd@@YAXPEBQECD at Z
; CHECK: void __cdecl foo_pbqcd(char volatile *const *)
?foo_pcrbd@@YAXPCRBD at Z
+; CHECK: void __cdecl foo_pcrbd(char const *volatile *)
?foo_pcrbd@@YAXPECREBD at Z
; CHECK: void __cdecl foo_pcrbd(char const *volatile *)
?foo_pcrcd@@YAXPCRCD at Z
+; CHECK: void __cdecl foo_pcrcd(char volatile *volatile *)
?foo_pcrcd@@YAXPECRECD at Z
; CHECK: void __cdecl foo_pcrcd(char volatile *volatile *)
@@ -98,151 +119,183 @@
; CHECK: void __cdecl foo_aad(char &)
?foo_abd@@YAXABD at Z
+; CHECK: void __cdecl foo_abd(char const &)
?foo_abd@@YAXAEBD at Z
; CHECK: void __cdecl foo_abd(char const &)
?foo_aapad@@YAXAAPAD at Z
+; CHECK: void __cdecl foo_aapad(char *&)
?foo_aapad@@YAXAEAPEAD at Z
; CHECK: void __cdecl foo_aapad(char *&)
?foo_aapbd@@YAXAAPBD at Z
+; CHECK: void __cdecl foo_aapbd(char const *&)
?foo_aapbd@@YAXAEAPEBD at Z
; CHECK: void __cdecl foo_aapbd(char const *&)
?foo_abqad@@YAXABQAD at Z
+; CHECK: void __cdecl foo_abqad(char *const &)
?foo_abqad@@YAXAEBQEAD at Z
; CHECK: void __cdecl foo_abqad(char *const &)
?foo_abqbd@@YAXABQBD at Z
+; CHECK: void __cdecl foo_abqbd(char const *const &)
?foo_abqbd@@YAXAEBQEBD at Z
; CHECK: void __cdecl foo_abqbd(char const *const &)
?foo_aay144h@@YAXAAY144H at Z
+; CHECK: void __cdecl foo_aay144h(int (&)[5][5])
?foo_aay144h@@YAXAEAY144H at Z
; CHECK: void __cdecl foo_aay144h(int (&)[5][5])
?foo_aay144cbh@@YAXAAY144$$CBH at Z
+; CHECK: void __cdecl foo_aay144cbh(int const (&)[5][5])
?foo_aay144cbh@@YAXAEAY144$$CBH at Z
; CHECK: void __cdecl foo_aay144cbh(int const (&)[5][5])
-; FIXME: We don't support rvalue references yet
-; ?foo_qay144h@@YAX$$QAY144H at Z
-; ?foo_qay144h@@YAX$$QEAY144H at Z
-; FIXME: void __cdecl foo_qay144h(int (&&)[5][5])
-
-; FIXME: We don't support rvalue references yet
-; ?foo_qay144cbh@@YAX$$QAY144$$CBH at Z
-; ?foo_qay144cbh@@YAX$$QEAY144$$CBH at Z
-; FIXME: void __cdecl foo_qay144cbh(int const (&&)[5][5])
+?foo_qay144h@@YAX$$QAY144H at Z
+; CHECK: void __cdecl foo_qay144h(int (&&)[5][5])
+?foo_qay144h@@YAX$$QEAY144H at Z
+; CHECK: void __cdecl foo_qay144h(int (&&)[5][5])
+
+?foo_qay144cbh@@YAX$$QAY144$$CBH at Z
+; CHECK: void __cdecl foo_qay144cbh(int const (&&)[5][5])
+?foo_qay144cbh@@YAX$$QEAY144$$CBH at Z
+; CHECK: void __cdecl foo_qay144cbh(int const (&&)[5][5])
?foo_p6ahxz@@YAXP6AHXZ at Z
+; CHECK: void __cdecl foo_p6ahxz(int (__cdecl *)(void))
?foo_p6ahxz@@YAXP6AHXZ at Z
; CHECK: void __cdecl foo_p6ahxz(int (__cdecl *)(void))
?foo_a6ahxz@@YAXA6AHXZ at Z
+; CHECK: void __cdecl foo_a6ahxz(int (__cdecl &)(void))
?foo_a6ahxz@@YAXA6AHXZ at Z
; CHECK: void __cdecl foo_a6ahxz(int (__cdecl &)(void))
-; FIXME: We don't support rvalue references yet
-; ?foo_q6ahxz@@YAX$$Q6AHXZ at Z
-; ?foo_q6ahxz@@YAX$$Q6AHXZ at Z
-; FIXME: void __cdecl foo_q6ahxz(int (__cdecl &&)(void))
+?foo_q6ahxz@@YAX$$Q6AHXZ at Z
+; CHECK: void __cdecl foo_q6ahxz(int (__cdecl &&)(void))
+?foo_q6ahxz@@YAX$$Q6AHXZ at Z
+; CHECK: void __cdecl foo_q6ahxz(int (__cdecl &&)(void))
?foo_qay04h@@YAXQAY04H at Z
?foo_qay04h@@YAXQEAY04H at Z
; CHECK: void __cdecl foo_qay04h(int (*const)[5])
?foo_qay04cbh@@YAXQAY04$$CBH at Z
+; CHECK: void __cdecl foo_qay04cbh(int const (*const)[5])
?foo_qay04cbh@@YAXQEAY04$$CBH at Z
; CHECK: void __cdecl foo_qay04cbh(int const (*const)[5])
?foo@@YAXPAY02N at Z
+; CHECK: void __cdecl foo(double (*)[3])
?foo@@YAXPEAY02N at Z
; CHECK: void __cdecl foo(double (*)[3])
?foo@@YAXQAN at Z
+; CHECK: void __cdecl foo(double *const)
?foo@@YAXQEAN at Z
; CHECK: void __cdecl foo(double *const)
?foo_const@@YAXQBN at Z
+; CHECK: void __cdecl foo_const(double const *const)
?foo_const@@YAXQEBN at Z
; CHECK: void __cdecl foo_const(double const *const)
?foo_volatile@@YAXQCN at Z
+; CHECK: void __cdecl foo_volatile(double volatile *const)
?foo_volatile@@YAXQECN at Z
; CHECK: void __cdecl foo_volatile(double volatile *const)
?foo@@YAXPAY02NQBNN at Z
+; CHECK: void __cdecl foo(double (*)[3], double const *const, double)
?foo@@YAXPEAY02NQEBNN at Z
; CHECK: void __cdecl foo(double (*)[3], double const *const, double)
?foo_fnptrconst@@YAXP6AXQAH at Z@Z
+; CHECK: void __cdecl foo_fnptrconst(void (__cdecl *)(int *const))
?foo_fnptrconst@@YAXP6AXQEAH at Z@Z
; CHECK: void __cdecl foo_fnptrconst(void (__cdecl *)(int *const))
?foo_fnptrarray@@YAXP6AXQAH at Z@Z
+; CHECK: void __cdecl foo_fnptrarray(void (__cdecl *)(int *const))
?foo_fnptrarray@@YAXP6AXQEAH at Z@Z
; CHECK: void __cdecl foo_fnptrarray(void (__cdecl *)(int *const))
-; ?foo_fnptrbackref1@@YAXP6AXQAH at Z1@Z
-; ?foo_fnptrbackref1@@YAXP6AXQEAH at Z1@Z
-; FIXME: void __cdecl foo_fnptrbackref1(void (__cdecl *)(int *const), void (__cdecl *)(int *const))
-
-; ?foo_fnptrbackref2@@YAXP6AXQAH at Z1@Z
-; ?foo_fnptrbackref2@@YAXP6AXQEAH at Z1@Z
-; FIXME: void __cdecl foo_fnptrbackref2(void (__cdecl *)(int *const), void (__cdecl *)(int *const))
-
-; ?foo_fnptrbackref3@@YAXP6AXQAH at Z1@Z
-; ?foo_fnptrbackref3@@YAXP6AXQEAH at Z1@Z
-; FIXME: void __cdecl foo_fnptrbackref3(void (*)(int *const), void (*)(int *))
-
-; ?foo_fnptrbackref4@@YAXP6AXPAH at Z1@Z
-; ?foo_fnptrbackref4@@YAXP6AXPEAH at Z1@Z
-; FIXME: void __cdecl foo_fnptrbackref4(void (*)(int *), void (*)(int *const))
+?foo_fnptrbackref1@@YAXP6AXQAH at Z1@Z
+; CHECK: void __cdecl foo_fnptrbackref1(void (__cdecl *)(int *const), void (__cdecl *)(int *const))
+?foo_fnptrbackref1@@YAXP6AXQEAH at Z1@Z
+; CHECK: void __cdecl foo_fnptrbackref1(void (__cdecl *)(int *const), void (__cdecl *)(int *const))
+
+?foo_fnptrbackref2@@YAXP6AXQAH at Z1@Z
+; CHECK: void __cdecl foo_fnptrbackref2(void (__cdecl *)(int *const), void (__cdecl *)(int *const))
+?foo_fnptrbackref2@@YAXP6AXQEAH at Z1@Z
+; CHECK: void __cdecl foo_fnptrbackref2(void (__cdecl *)(int *const), void (__cdecl *)(int *const))
+
+?foo_fnptrbackref3@@YAXP6AXQAH at Z1@Z
+; CHECK: void __cdecl foo_fnptrbackref3(void (__cdecl *)(int *const), void (__cdecl *)(int *const))
+?foo_fnptrbackref3@@YAXP6AXQEAH at Z1@Z
+; CHECK: void __cdecl foo_fnptrbackref3(void (__cdecl *)(int *const), void (__cdecl *)(int *const))
+
+?foo_fnptrbackref4@@YAXP6AXPAH at Z1@Z
+; CHECK: void __cdecl foo_fnptrbackref4(void (__cdecl *)(int *), void (__cdecl *)(int *))
+?foo_fnptrbackref4@@YAXP6AXPEAH at Z1@Z
+; CHECK: void __cdecl foo_fnptrbackref4(void (__cdecl *)(int *), void (__cdecl *)(int *))
?ret_fnptrarray@@YAP6AXQAH at ZXZ
+; CHECK: void (__cdecl * __cdecl ret_fnptrarray(void))(int *const)
?ret_fnptrarray@@YAP6AXQEAH at ZXZ
; CHECK: void (__cdecl * __cdecl ret_fnptrarray(void))(int *const)
; The first argument gets mangled as-if it were written int *const
; The second arg should not form a backref because it isn't qualified
?mangle_no_backref0@@YAXQAHPAH at Z
+; CHECK: void __cdecl mangle_no_backref0(int *const, int *)
?mangle_no_backref0@@YAXQEAHPEAH at Z
; CHECK: void __cdecl mangle_no_backref0(int *const, int *)
?mangle_no_backref1@@YAXQAHQAH at Z
+; CHECK: void __cdecl mangle_no_backref1(int *const, int *const)
?mangle_no_backref1@@YAXQEAHQEAH at Z
; CHECK: void __cdecl mangle_no_backref1(int *const, int *const)
; Pointer to function types don't backref with function types
?mangle_no_backref2@@YAXP6AXXZP6AXXZ at Z
+; CHECK: void __cdecl mangle_no_backref2(void (__cdecl *)(void), void (__cdecl *)(void))
?mangle_no_backref2@@YAXP6AXXZP6AXXZ at Z
; CHECK: void __cdecl mangle_no_backref2(void (__cdecl *)(void), void (__cdecl *)(void))
?mangle_yes_backref0@@YAXQAH0 at Z
+; CHECK: void __cdecl mangle_yes_backref0(int *const, int *const)
?mangle_yes_backref0@@YAXQEAH0 at Z
; CHECK: void __cdecl mangle_yes_backref0(int *const, int *const)
?mangle_yes_backref1@@YAXQAH0 at Z
+; CHECK: void __cdecl mangle_yes_backref1(int *const, int *const)
?mangle_yes_backref1@@YAXQEAH0 at Z
; CHECK: void __cdecl mangle_yes_backref1(int *const, int *const)
?mangle_yes_backref2@@YAXQBQ6AXXZ0 at Z
+; CHECK: void __cdecl mangle_yes_backref2(void (__cdecl *const *const)(void), void (__cdecl *const *const)(void))
?mangle_yes_backref2@@YAXQEBQ6AXXZ0 at Z
; CHECK: void __cdecl mangle_yes_backref2(void (__cdecl *const *const)(void), void (__cdecl *const *const)(void))
?mangle_yes_backref3@@YAXQAP6AXXZ0 at Z
+; CHECK: void __cdecl mangle_yes_backref3(void (__cdecl **const)(void), void (__cdecl **const)(void))
?mangle_yes_backref3@@YAXQEAP6AXXZ0 at Z
; CHECK: void __cdecl mangle_yes_backref3(void (__cdecl **const)(void), void (__cdecl **const)(void))
?mangle_yes_backref4@@YAXQIAH0 at Z
+; CHECK: void __cdecl mangle_yes_backref4(int *const __restrict, int *const __restrict)
?mangle_yes_backref4@@YAXQEIAH0 at Z
; CHECK: void __cdecl mangle_yes_backref4(int *const __restrict, int *const __restrict)
?pr23325@@YAXQBUS@@0 at Z
+; CHECK: void __cdecl pr23325(struct S const *const, struct S const *const)
?pr23325@@YAXQEBUS@@0 at Z
; CHECK: void __cdecl pr23325(struct S const *const, struct S const *const)
; ?vla_arg@@YAXHQAY0A at H@Z
+; FIXME: void __cdecl vla_arg(int i, int (*const)[0])
; ?vla_arg@@YAXHQEAY0A at H@Z
; FIXME: void __cdecl vla_arg(int i, int (*const)[0])
More information about the llvm-commits
mailing list