From: NAKAMURA Takumi <geek4civic@gmail.com>
Date: Tue, 20 May 2014 15:44:42 +0000 (+0000)
Subject: clang/test/SemaCXX/err_init_conversion_failed.cpp: Tweak for i686-msvc.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a511c925e8b7e112a4b5562367ed494d6c2977ac;p=clang

clang/test/SemaCXX/err_init_conversion_failed.cpp: Tweak for i686-msvc.

For targeting i686-msvc, declarations are seen as thiscall like;

  void (template_test::S::*)(const int &) __attribute__((thiscall))
  void (template_test::S::*)(int) __attribute__((thiscall))

It didn't affect x86_64-msvc.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@209212 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/SemaCXX/err_init_conversion_failed.cpp b/test/SemaCXX/err_init_conversion_failed.cpp
index 14d4954743..e31f215b45 100644
--- a/test/SemaCXX/err_init_conversion_failed.cpp
+++ b/test/SemaCXX/err_init_conversion_failed.cpp
@@ -56,6 +56,6 @@ template <class P> struct S2 {
 
 void test_15() {
   S2<S> X = {&S::foo};
-  // expected-error@-1{{cannot initialize a member subobject of type 'void (template_test::S::*)(const int &)' with an rvalue of type 'void (template_test::S::*)(int)': type mismatch at 1st parameter ('const int &' vs 'int')}}
+  // expected-error-re@-1{{cannot initialize a member subobject of type 'void (template_test::S::*)(const int &){{( __attribute__\(\(thiscall\)\))?}}' with an rvalue of type 'void (template_test::S::*)(int){{( __attribute__\(\(thiscall\)\))?}}': type mismatch at 1st parameter ('const int &' vs 'int')}}
 }
 }