Temporary fix for MS _Interlocked intrinsics

llvm-svn: 281401

2 files changed, 59 insertions, 10 deletions

diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp
index 18630441421..94be5361e94 100644
--- a/clang/lib/CodeGen/CGBuiltin.cpp
+++ b/clang/lib/CodeGen/CGBuiltin.cpp
@@ -1963,7 +1963,6 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD,
   case Builtin::BI_InterlockedExchange8:
   case Builtin::BI_InterlockedExchange16:
   case Builtin::BI_InterlockedExchange:
-  case Builtin::BI_InterlockedExchange64:
   case Builtin::BI_InterlockedExchangePointer:
     return EmitBinaryAtomic(*this, llvm::AtomicRMWInst::Xchg, E);
   case Builtin::BI_InterlockedCompareExchangePointer: {
@@ -2007,8 +2006,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD,
       return RValue::get(Builder.CreateExtractValue(CXI, 0));
   }
   case Builtin::BI_InterlockedIncrement16:
-  case Builtin::BI_InterlockedIncrement:
-  case Builtin::BI_InterlockedIncrement64: {
+  case Builtin::BI_InterlockedIncrement: {
     llvm::Type *IntTy = ConvertType(E->getType());
     AtomicRMWInst *RMWI = Builder.CreateAtomicRMW(
       AtomicRMWInst::Add,
@@ -2018,8 +2016,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD,
     return RValue::get(Builder.CreateAdd(RMWI, ConstantInt::get(IntTy, 1)));
   }
   case Builtin::BI_InterlockedDecrement16:
-  case Builtin::BI_InterlockedDecrement:
-  case Builtin::BI_InterlockedDecrement64: {
+  case Builtin::BI_InterlockedDecrement: {
     llvm::Type *IntTy = ConvertType(E->getType());
     AtomicRMWInst *RMWI = Builder.CreateAtomicRMW(
       AtomicRMWInst::Sub,
@@ -2031,27 +2028,22 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD,
   case Builtin::BI_InterlockedAnd8:
   case Builtin::BI_InterlockedAnd16:
   case Builtin::BI_InterlockedAnd:
-  case Builtin::BI_InterlockedAnd64:
     return EmitBinaryAtomic(*this, AtomicRMWInst::And, E);
   case Builtin::BI_InterlockedExchangeAdd8:
   case Builtin::BI_InterlockedExchangeAdd16:
   case Builtin::BI_InterlockedExchangeAdd:
-  case Builtin::BI_InterlockedExchangeAdd64:
     return EmitBinaryAtomic(*this, AtomicRMWInst::Add, E);
   case Builtin::BI_InterlockedExchangeSub8:
   case Builtin::BI_InterlockedExchangeSub16:
   case Builtin::BI_InterlockedExchangeSub:
-  case Builtin::BI_InterlockedExchangeSub64:
     return EmitBinaryAtomic(*this, AtomicRMWInst::Sub, E);
   case Builtin::BI_InterlockedOr8:
   case Builtin::BI_InterlockedOr16:
   case Builtin::BI_InterlockedOr:
-  case Builtin::BI_InterlockedOr64:
     return EmitBinaryAtomic(*this, AtomicRMWInst::Or, E);
   case Builtin::BI_InterlockedXor8:
   case Builtin::BI_InterlockedXor16:
   case Builtin::BI_InterlockedXor:
-  case Builtin::BI_InterlockedXor64:
     return EmitBinaryAtomic(*this, AtomicRMWInst::Xor, E);
   case Builtin::BI__readfsdword: {
     llvm::Type *IntTy = ConvertType(E->getType());
diff --git a/clang/lib/Headers/intrin.h b/clang/lib/Headers/intrin.h
index d0b500e9914..c19202eb613 100644
--- a/clang/lib/Headers/intrin.h
+++ b/clang/lib/Headers/intrin.h
@@ -546,6 +546,63 @@ _interlockedbittestandset64(__int64 volatile *_BitBase, __int64 _BitPos) {
       __atomic_fetch_or(_BitBase, 1ll << _BitPos, __ATOMIC_SEQ_CST);
   return (_PrevVal >> _BitPos) & 1;
 }
+/*----------------------------------------------------------------------------*\

+|* Interlocked Exchange Add

+\*----------------------------------------------------------------------------*/

+static __inline__ __int64 __DEFAULT_FN_ATTRS

+_InterlockedExchangeAdd64(__int64 volatile *_Addend, __int64 _Value) {

+	return __atomic_fetch_add(_Addend, _Value, __ATOMIC_SEQ_CST);

+}

+/*----------------------------------------------------------------------------*\

+|* Interlocked Exchange Sub

+\*----------------------------------------------------------------------------*/

+static __inline__ __int64 __DEFAULT_FN_ATTRS

+_InterlockedExchangeSub64(__int64 volatile *_Subend, __int64 _Value) {

+	return __atomic_fetch_sub(_Subend, _Value, __ATOMIC_SEQ_CST);

+}

+/*----------------------------------------------------------------------------*\

+|* Interlocked Increment

+\*----------------------------------------------------------------------------*/

+static __inline__ __int64 __DEFAULT_FN_ATTRS

+_InterlockedIncrement64(__int64 volatile *_Value) {

+	return __atomic_add_fetch(_Value, 1, __ATOMIC_SEQ_CST);

+}

+/*----------------------------------------------------------------------------*\

+|* Interlocked Decrement

+\*----------------------------------------------------------------------------*/

+static __inline__ __int64 __DEFAULT_FN_ATTRS

+_InterlockedDecrement64(__int64 volatile *_Value) {

+	return __atomic_sub_fetch(_Value, 1, __ATOMIC_SEQ_CST);

+}

+/*----------------------------------------------------------------------------*\

+|* Interlocked And

+\*----------------------------------------------------------------------------*/

+static __inline__ __int64 __DEFAULT_FN_ATTRS

+_InterlockedAnd64(__int64 volatile *_Value, __int64 _Mask) {

+	return __atomic_fetch_and(_Value, _Mask, __ATOMIC_SEQ_CST);

+}

+/*----------------------------------------------------------------------------*\

+|* Interlocked Or

+\*----------------------------------------------------------------------------*/

+static __inline__ __int64 __DEFAULT_FN_ATTRS

+_InterlockedOr64(__int64 volatile *_Value, __int64 _Mask) {

+	return __atomic_fetch_or(_Value, _Mask, __ATOMIC_SEQ_CST);

+}

+/*----------------------------------------------------------------------------*\

+|* Interlocked Xor

+\*----------------------------------------------------------------------------*/

+static __inline__ __int64 __DEFAULT_FN_ATTRS

+_InterlockedXor64(__int64 volatile *_Value, __int64 _Mask) {

+	return __atomic_fetch_xor(_Value, _Mask, __ATOMIC_SEQ_CST);

+}

+/*----------------------------------------------------------------------------*\

+|* Interlocked Exchange

+\*----------------------------------------------------------------------------*/

+static __inline__ __int64 __DEFAULT_FN_ATTRS

+_InterlockedExchange64(__int64 volatile *_Target, __int64 _Value) {

+	__atomic_exchange(_Target, &_Value, &_Value, __ATOMIC_SEQ_CST);

+	return _Value;

+}

 #endif
 /*----------------------------------------------------------------------------*\
 |* Barriers