[llvm-commits] [llvm] r140040 - in /llvm/trunk: lib/Bitcode/Reader/BitcodeReader.cpp test/Assembler/atomic.ll

[Eli Friedman]

Author: efriedma
Date: Mon Sep 19 14:41:28 2011
New Revision: 140040

URL: http://llvm.org/viewvc/llvm-project?rev=140040&view=rev
Log:
Fix a typo in the bitcode reader in the handling of atomic stores.  Reported by David Meyer on llvmdev.


Modified:
    llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
    llvm/trunk/test/Assembler/atomic.ll

Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=140040&r1=140039&r2=140040&view=diff
==============================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Mon Sep 19 14:41:28 2011
@@ -2653,7 +2653,7 @@
         return Error("Invalid STOREATOMIC record");
 
       AtomicOrdering Ordering = GetDecodedOrdering(Record[OpNum+2]);
-      if (Ordering == NotAtomic || Ordering == Release ||
+      if (Ordering == NotAtomic || Ordering == Acquire ||
           Ordering == AcquireRelease)
         return Error("Invalid STOREATOMIC record");
       SynchronizationScope SynchScope = GetDecodedSynchScope(Record[OpNum+3]);

Modified: llvm/trunk/test/Assembler/atomic.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/atomic.ll?rev=140040&r1=140039&r2=140040&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/atomic.ll (original)
+++ llvm/trunk/test/Assembler/atomic.ll Mon Sep 19 14:41:28 2011
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s | FileCheck %s
+; RUN: opt < %s | opt -S | FileCheck %s
 ; Basic smoke test for atomic operations.
 
 define void @f(i32* %x) {