commit 7ce96b853dffeca7e37c78fa4a02fe8415b3ab9b
author Nico Weber <nicolasweber@gmx.de> Fri Feb 13 16:27:00 2015 +0000
committer Nico Weber <nicolasweber@gmx.de> Fri Feb 13 16:27:00 2015 +0000
tree ac285eddc707325d791f53080aba8a6c26b313f9
parent 3236c7245846d87dfdfe110ad1d098ca10abc961

Revert r229082 for a bit, it caused PR22577.

llvm-svn: 229123

clang/lib/CodeGen/CGExpr.cpp

diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index 18aa262..568f949 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -1136,7 +1136,7 @@
   }
 
   // Atomic operations have to be done on integral types.
-  if (Ty->isAtomicType() || typeIsSuitableForInlineAtomic(Ty, Volatile)) {
+  if (Ty->isAtomicType()) {
     LValue lvalue = LValue::MakeAddr(Addr, Ty,
                                      CharUnits::fromQuantity(Alignment),
                                      getContext(), TBAAInfo);
@@ -1255,8 +1255,7 @@
 
   Value = EmitToMemory(Value, Ty);
 
-  if (Ty->isAtomicType() ||
-      (!isInit && typeIsSuitableForInlineAtomic(Ty, Volatile))) {
+  if (Ty->isAtomicType()) {
     EmitAtomicStore(RValue::get(Value),
                     LValue::MakeAddr(Addr, Ty,
                                      CharUnits::fromQuantity(Alignment),