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

[Julien Lerouge]

Author: jlerouge
Date: Tue Aug 26 17:11:53 2014
New Revision: 216496

URL: http://llvm.org/viewvc/llvm-project?rev=216496&view=rev
Log:
Revert 216491, it breaks CodeGenCXX/microsoft-abi-member-pointers.cpp

Removed:
    cfe/trunk/test/CodeGen/x86_64-arguments-win32.c
Modified:
    cfe/trunk/lib/CodeGen/TargetInfo.cpp
    cfe/trunk/test/CodeGen/2007-06-18-SextAttrAggregate.c

Modified: cfe/trunk/lib/CodeGen/TargetInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/TargetInfo.cpp?rev=216496&r1=216495&r2=216496&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/TargetInfo.cpp (original)
+++ cfe/trunk/lib/CodeGen/TargetInfo.cpp Tue Aug 26 17:11:53 2014
@@ -2773,6 +2773,9 @@ ABIArgInfo WinX86_64ABIInfo::classify(Qu
     return ABIArgInfo::getDirect(llvm::IntegerType::get(getVMContext(), Size));
   }
 
+  if (Ty->isPromotableIntegerType())
+    return ABIArgInfo::getExtend();
+
   return ABIArgInfo::getDirect();
 }
 

Modified: cfe/trunk/test/CodeGen/2007-06-18-SextAttrAggregate.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/2007-06-18-SextAttrAggregate.c?rev=216496&r1=216495&r2=216496&view=diff
==============================================================================
--- cfe/trunk/test/CodeGen/2007-06-18-SextAttrAggregate.c (original)
+++ cfe/trunk/test/CodeGen/2007-06-18-SextAttrAggregate.c Tue Aug 26 17:11:53 2014
@@ -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.
 

Removed: cfe/trunk/test/CodeGen/x86_64-arguments-win32.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/x86_64-arguments-win32.c?rev=216495&view=auto
==============================================================================
--- cfe/trunk/test/CodeGen/x86_64-arguments-win32.c (original)
+++ cfe/trunk/test/CodeGen/x86_64-arguments-win32.c (removed)
@@ -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) {}