Concurrency support for PNaCl ABI

lib/Transforms/NaCl/ReplacePtrsWithInts.cpp

Index: lib/Transforms/NaCl/ReplacePtrsWithInts.cpp
diff --git a/lib/Transforms/NaCl/ReplacePtrsWithInts.cpp b/lib/Transforms/NaCl/ReplacePtrsWithInts.cpp
index c812f4d4328763beeb9039f09d5afc9d8633a29d..9ed5ee2c779fa1adb7b7fde8babc62c95314d6ba 100644
--- a/lib/Transforms/NaCl/ReplacePtrsWithInts.cpp
+++ b/lib/Transforms/NaCl/ReplacePtrsWithInts.cpp
@@ -491,19 +491,19 @@ static void ConvertInstruction(DataLayout *DL, Type *IntPtrType,
     Value *Alloca2 = new PtrToIntInst(Tmp, IntPtrType,
                                       Tmp->getName() + ".asint", Inst);
     FC->recordConvertedAndErase(Alloca, Alloca2);
-  } else if (// These atomics only operate on integer pointers, not
-             // other pointers, so we don't need to recreate the
-             // instruction.
-             isa<AtomicCmpXchgInst>(Inst) ||
-             isa<AtomicRMWInst>(Inst) ||
-             // Handle these instructions as a convenience to allow
+  } else if (// Handle these instructions as a convenience to allow
              // the pass to be used in more situations, even though we
              // don't expect them in PNaCl's stable ABI.
              isa<GetElementPtrInst>(Inst) ||
              isa<VAArgInst>(Inst) ||
              isa<IndirectBrInst>(Inst) ||
              isa<ExtractValueInst>(Inst) ||
-             isa<InsertValueInst>(Inst)) {
+             isa<InsertValueInst>(Inst) ||
+             // These atomics only operate on integer pointers, not

[Mark Seaborn, 2013/06/26 14:33:41]

Please undo this part of the change -- it's just a reordering

[JF, 2013/06/26 15:52:29]

Not quite: the top comment now applies to the atomic instructions as well, which
it did not before. There is indeed no code change, but the comment was
incorrect.

+             // other pointers, so we don't need to recreate the
+             // instruction.
+             isa<AtomicCmpXchgInst>(Inst) ||
+             isa<AtomicRMWInst>(Inst)) {
     FC->convertInPlace(Inst);
   }
 }