From: Richard Diamond <wichard@vitalitystudios.com>
Date: Wed, 5 Aug 2015 22:10:57 +0000 (+0000)
Subject: Divide the primitive size in bits by eight so the initial load's alignment is in
X-Git-Tag: studio-1.4~757
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=559c1d72a94dcd7dba088438359422591aa3355b;p=platform%2Fupstream%2Fllvm.git

Divide the primitive size in bits by eight so the initial load's alignment is in
bytes as expected. Tested with the included unit test.

llvm-svn: 244155
---

diff --git a/llvm/lib/CodeGen/AtomicExpandPass.cpp b/llvm/lib/CodeGen/AtomicExpandPass.cpp
index 03b0ff3..c10648c 100644
--- a/llvm/lib/CodeGen/AtomicExpandPass.cpp
+++ b/llvm/lib/CodeGen/AtomicExpandPass.cpp
@@ -550,7 +550,7 @@ bool llvm::expandAtomicRMWToCmpXchg(AtomicRMWInst *AI,
   Builder.SetInsertPoint(BB);
   LoadInst *InitLoaded = Builder.CreateLoad(Addr);
   // Atomics require at least natural alignment.
-  InitLoaded->setAlignment(AI->getType()->getPrimitiveSizeInBits());
+  InitLoaded->setAlignment(AI->getType()->getPrimitiveSizeInBits() / 8);
   Builder.CreateBr(LoopBB);
 
   // Start the main loop block now that we've taken care of the preliminaries.
diff --git a/llvm/test/Transforms/AtomicExpand/expand-atomic-rmw-initial-load.ll b/llvm/test/Transforms/AtomicExpand/expand-atomic-rmw-initial-load.ll
new file mode 100644
index 0000000..197250e
--- /dev/null
+++ b/llvm/test/Transforms/AtomicExpand/expand-atomic-rmw-initial-load.ll
@@ -0,0 +1,8 @@
+; RUN: opt -S %s -atomic-expand -mtriple=i686-linux-gnu | FileCheck %s
+
+define i8 @test_initial_load(i8* %ptr, i8 %value) {
+  %res = atomicrmw nand i8* %ptr, i8 %value seq_cst
+  ret i8 %res
+}
+; CHECK-LABEL: @test_initial_load
+; CHECK-NEXT:    %1 = load i8, i8* %ptr, align 1