Revert 216491, it breaks CodeGenCXX/microsoft-abi-member-pointers.cpp

llvm-svn: 216496

3 files changed, 4 insertions, 19 deletions

diff --git a/clang/lib/CodeGen/TargetInfo.cpp b/clang/lib/CodeGen/TargetInfo.cpp
index 4e4f03b6c09..ea5f7c22399 100644
--- a/clang/lib/CodeGen/TargetInfo.cpp
+++ b/clang/lib/CodeGen/TargetInfo.cpp
@@ -2773,6 +2773,9 @@ ABIArgInfo WinX86_64ABIInfo::classify(QualType Ty, bool IsReturnType) const {
     return ABIArgInfo::getDirect(llvm::IntegerType::get(getVMContext(), Size));
   }
 
+  if (Ty->isPromotableIntegerType())
+    return ABIArgInfo::getExtend();
+
   return ABIArgInfo::getDirect();
 }
 
diff --git a/clang/test/CodeGen/2007-06-18-SextAttrAggregate.c b/clang/test/CodeGen/2007-06-18-SextAttrAggregate.c
index 22aa95a6bff..92171e2bd9b 100644
--- a/clang/test/CodeGen/2007-06-18-SextAttrAggregate.c
+++ b/clang/test/CodeGen/2007-06-18-SextAttrAggregate.c
@@ -1,13 +1,11 @@
 // RUN: %clang_cc1 %s -o - -emit-llvm | FileCheck %s
-// XFAIL: aarch64, arm64, x86_64-pc-win32
+// XFAIL: aarch64, arm64
 
 // PR1513
 
 // AArch64 ABI actually requires the reverse of what this is testing: the callee
 // does any extensions and remaining bits are unspecified.
 
-// Win64 ABI does expect extensions for type smaller than 64bits.
-
 // Technically this test wasn't written to test that feature, but it's a
 // valuable check nevertheless.
 
diff --git a/clang/test/CodeGen/x86_64-arguments-win32.c b/clang/test/CodeGen/x86_64-arguments-win32.c
deleted file mode 100644
index 5aea7fc6236..00000000000
--- a/clang/test/CodeGen/x86_64-arguments-win32.c
+++ /dev/null
@@ -1,16 +0,0 @@
-// RUN: %clang_cc1 -w -triple x86_64-pc-win32 -emit-llvm -o - %s | FileCheck %s
-
-// To be ABI compatible with code generated by MSVC, there shouldn't be any
-// sign/zero extensions on types smaller than 64bit.
-
-// CHECK-LABEL: define void @f1(i8 %a)
-void f1(char a) {}
-
-// CHECK-LABEL: define void @f2(i8 %a)
-void f2(unsigned char a) {}
-
-// CHECK-LABEL: define void @f3(i16 %a)
-void f3(short a) {}
-
-// CHECK-LABEL: define void @f4(i16 %a)
-void f4(unsigned short a) {}