diff options
author | Pirama Arumuga Nainar <pirama@google.com> | 2015-04-10 22:08:18 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-10 22:08:18 +0000 |
commit | 13a7db5b9c4f5e543d037be68ec3428216bfd550 (patch) | |
tree | 1b2c9792582e12f5af0b1512e3094425f0dc0df9 /test/Transforms/GlobalOpt/atomic.ll | |
parent | 0eb46f5d1e06a4284663d636a74b06adc3a161d7 (diff) | |
parent | 31195f0bdca6ee2a5e72d07edf13e1d81206d949 (diff) | |
download | external_llvm-13a7db5b9c4f5e543d037be68ec3428216bfd550.zip external_llvm-13a7db5b9c4f5e543d037be68ec3428216bfd550.tar.gz external_llvm-13a7db5b9c4f5e543d037be68ec3428216bfd550.tar.bz2 |
am 31195f0b: Merge "Update aosp/master llvm for rebase to r233350"
* commit '31195f0bdca6ee2a5e72d07edf13e1d81206d949':
Update aosp/master llvm for rebase to r233350
Diffstat (limited to 'test/Transforms/GlobalOpt/atomic.ll')
-rw-r--r-- | test/Transforms/GlobalOpt/atomic.ll | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/Transforms/GlobalOpt/atomic.ll b/test/Transforms/GlobalOpt/atomic.ll index ac05bfd..563c1fe 100644 --- a/test/Transforms/GlobalOpt/atomic.ll +++ b/test/Transforms/GlobalOpt/atomic.ll @@ -8,7 +8,7 @@ define void @test1() { entry: - %0 = load atomic i8* bitcast (i64* @GV1 to i8*) acquire, align 8 + %0 = load atomic i8, i8* bitcast (i64* @GV1 to i8*) acquire, align 8 ret void } @@ -20,6 +20,6 @@ entry: } define i32 @test2b() { entry: - %atomic-load = load atomic i32* @GV2 seq_cst, align 4 + %atomic-load = load atomic i32, i32* @GV2 seq_cst, align 4 ret i32 %atomic-load } |