commit afc074cc4149d8e16230fc0870458ed455c5e3ba
author Ivan A. Kosarev <ikosarev@accesssoftek.com> Thu Oct 05 11:05:43 2017 +0000
committer Ivan A. Kosarev <ikosarev@accesssoftek.com> Thu Oct 05 11:05:43 2017 +0000
tree b5662b30e602ab0041638809dac208cd825007b4
parent 6fa20cfea320bfcc45e7fa70a2ead481df8a4ce8

Revert r314977 "[CodeGen] Unify generation of scalar and struct-path TBAA tags"

D37826 has been mistakenly committed where it should be the patch from D38503.

Differential Revision: https://reviews.llvm.org/D38503

llvm-svn: 314978

clang/lib/CodeGen/CGAtomic.cpp

diff --git a/clang/lib/CodeGen/CGAtomic.cpp b/clang/lib/CodeGen/CGAtomic.cpp
index 54966dd..c03e06d 100644
--- a/clang/lib/CodeGen/CGAtomic.cpp
+++ b/clang/lib/CodeGen/CGAtomic.cpp
@@ -205,7 +205,7 @@
         addr = CGF.Builder.CreateStructGEP(addr, 0, CharUnits());
 
       return LValue::MakeAddr(addr, getValueType(), CGF.getContext(),
-                              LVal.getBaseInfo(), LVal.getTBAAInfo());
+                              LVal.getBaseInfo(), LVal.getTBAAAccessType());
     }
 
     /// \brief Emits atomic load.
@@ -1425,7 +1425,8 @@
   // Other decoration.
   if (IsVolatile)
     Load->setVolatile(true);
-  CGF.CGM.DecorateInstructionWithTBAA(Load, LVal.getTBAAInfo());
+  if (LVal.getTBAAAccessType())
+    CGF.CGM.DecorateInstructionWithTBAA(Load, LVal.getTBAAAccessType());
   return Load;
 }
 
@@ -1941,7 +1942,8 @@
     // Other decoration.
     if (IsVolatile)
       store->setVolatile(true);
-    CGM.DecorateInstructionWithTBAA(store, dest.getTBAAInfo());
+    if (dest.getTBAAAccessType())
+      CGM.DecorateInstructionWithTBAA(store, dest.getTBAAAccessType());
     return;
   }