From b58e62139f7c534f587f2d072c4184f978a578e4 Mon Sep 17 00:00:00 2001
From: Robert Khasanov <rob.khasanov@gmail.com>
Date: Wed, 24 Sep 2014 06:45:23 +0000
Subject: [PATCH] [x86] Fixed argument types in intrinsics: _addcarryx_u64
 _addcarry_u64 _subborrow_u64

Thanks Pasi Parviainen for notice.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@218376 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Headers/adxintrin.h     | 12 ++++++------
 test/CodeGen/adc-builtins.c | 12 +++++++-----
 test/CodeGen/adx-builtins.c |  5 +++--
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/lib/Headers/adxintrin.h b/lib/Headers/adxintrin.h
index 4065c24a96..9db8bcbd90 100644
--- a/lib/Headers/adxintrin.h
+++ b/lib/Headers/adxintrin.h
@@ -39,8 +39,8 @@ _addcarryx_u32(unsigned char __cf, unsigned int __x, unsigned int __y,
 
 #ifdef __x86_64__
 static __inline unsigned char __attribute__((__always_inline__, __nodebug__))
-_addcarryx_u64(unsigned char __cf, unsigned long __x, unsigned long __y,
-               unsigned long long  *__p)
+_addcarryx_u64(unsigned char __cf, unsigned long long __x,
+               unsigned long long __y, unsigned long long  *__p)
 {
   return __builtin_ia32_addcarryx_u64(__cf, __x, __y, __p);
 }
@@ -57,8 +57,8 @@ _addcarry_u32(unsigned char __cf, unsigned int __x, unsigned int __y,
 
 #ifdef __x86_64__
 static __inline unsigned char __attribute__((__always_inline__, __nodebug__))
-_addcarry_u64(unsigned char __cf, unsigned long __x, unsigned long __y,
-              unsigned long long  *__p)
+_addcarry_u64(unsigned char __cf, unsigned long long __x,
+              unsigned long long __y, unsigned long long  *__p)
 {
   return __builtin_ia32_addcarry_u64(__cf, __x, __y, __p);
 }
@@ -73,8 +73,8 @@ _subborrow_u32(unsigned char __cf, unsigned int __x, unsigned int __y,
 
 #ifdef __x86_64__
 static __inline unsigned char __attribute__((__always_inline__, __nodebug__))
-_subborrow_u64(unsigned char __cf, unsigned long __x, unsigned long __y,
-              unsigned long long  *__p)
+_subborrow_u64(unsigned char __cf, unsigned long long __x,
+               unsigned long long __y, unsigned long long  *__p)
 {
   return __builtin_ia32_subborrow_u64(__cf, __x, __y, __p);
 }
diff --git a/test/CodeGen/adc-builtins.c b/test/CodeGen/adc-builtins.c
index 1ee0a69c26..5577d22c60 100644
--- a/test/CodeGen/adc-builtins.c
+++ b/test/CodeGen/adc-builtins.c
@@ -9,22 +9,24 @@ unsigned char test_addcarry_u32(unsigned char __cf, unsigned int __x,
   return _addcarry_u32(__cf, __x, __y, __p);
 }
 
-unsigned char test_addcarry_u64(unsigned char __cf, unsigned long __x,
-                                unsigned long __y, unsigned long long *__p) {
+unsigned char test_addcarry_u64(unsigned char __cf, unsigned long long __x,
+                                unsigned long long __y,
+                                unsigned long long *__p) {
 // CHECK-LABEL: test_addcarry_u64
 // CHECK: call i8 @llvm.x86.addcarry.u64
   return _addcarry_u64(__cf, __x, __y, __p);
 }
 
 unsigned char test_subborrow_u32(unsigned char __cf, unsigned int __x,
-                                unsigned int __y, unsigned int *__p) {
+                                 unsigned int __y, unsigned int *__p) {
 // CHECK-LABEL: test_subborrow_u32
 // CHECK: call i8 @llvm.x86.subborrow.u32
   return _subborrow_u32(__cf, __x, __y, __p);
 }
 
-unsigned char test_subborrow_u64(unsigned char __cf, unsigned long __x,
-                                unsigned long __y, unsigned long long *__p) {
+unsigned char test_subborrow_u64(unsigned char __cf, unsigned long long __x,
+                                 unsigned long long __y,
+                                 unsigned long long *__p) {
 // CHECK-LABEL: test_subborrow_u64
 // CHECK: call i8 @llvm.x86.subborrow.u64
   return _subborrow_u64(__cf, __x, __y, __p);
diff --git a/test/CodeGen/adx-builtins.c b/test/CodeGen/adx-builtins.c
index 65b4dfd5f5..8738c5d177 100644
--- a/test/CodeGen/adx-builtins.c
+++ b/test/CodeGen/adx-builtins.c
@@ -9,8 +9,9 @@ unsigned char test_addcarryx_u32(unsigned char __cf, unsigned int __x,
   return _addcarryx_u32(__cf, __x, __y, __p);
 }
 
-unsigned char test_addcarryx_u64(unsigned char __cf, unsigned long __x,
-                                 unsigned long __y, unsigned long long *__p) {
+unsigned char test_addcarryx_u64(unsigned char __cf, unsigned long long __x,
+                                 unsigned long long __y,
+                                 unsigned long long *__p) {
 // CHECK-LABEL: test_addcarryx_u64
 // CHECK: call i8 @llvm.x86.addcarryx.u64
   return _addcarryx_u64(__cf, __x, __y, __p);
-- 
2.40.0