commit 02df2e08720f26f93130c48ec7a14e82e86062fb
author Aaron Ballman <aaron@aaronballman.com> Sun Dec 09 17:45:41 2012 +0000
committer Aaron Ballman <aaron@aaronballman.com> Sun Dec 09 17:45:41 2012 +0000
tree 2b9b1db7fffa7a9b5f3b6949123e5047c29b2ae8
parent c11b91ec18e97a6474baf7626c3348223837b93c

Virtual method overrides can no longer have mismatched calling conventions.  This fixes PR14339.

llvm-svn: 169705

clang/lib/Basic/Targets.cpp

diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp
index 9cfa278..6d883c8 100644
--- a/clang/lib/Basic/Targets.cpp
+++ b/clang/lib/Basic/Targets.cpp
@@ -1806,8 +1806,8 @@
             CC == CC_X86Pascal) ? CCCR_OK : CCCR_Warning;
   }
 
-  virtual CallingConv getDefaultCallingConv() const {
-    return CC_C;
+  virtual CallingConv getDefaultCallingConv(CallingConvMethodType MT) const {
+    return MT == CCMT_Member ? CC_X86ThisCall : CC_C;
   }
 };
 
@@ -2896,8 +2896,8 @@
     return TargetInfo::checkCallingConvention(CC);
   }
 
-  virtual CallingConv getDefaultCallingConv() const {
-    return CC_Default;
+  virtual CallingConv getDefaultCallingConv(CallingConvMethodType MT) const {
+    return CC_C;
   }
 
 };