Concurrency support for PNaCl ABI

lib/Transforms/NaCl/ReplacePtrsWithInts.cpp

 //===- ReplacePtrsWithInts.cpp - Convert pointer values to integer values--===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This pass strips out aggregate pointer types and replaces them with
@@ skipping 473 matching lines @@
     unsigned Alignment = Alloca->getAlignment();
     if (Alignment == 0)
       Alignment = DL->getPrefTypeAlignment(ElementTy);
     Value *Tmp = CopyDebug(new AllocaInst(Type::getInt8Ty(Inst->getContext()),
                                           MulSize, Alignment, "", Inst),
                            Inst);
     Tmp->takeName(Alloca);
     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);
   }
 }
 
 // Convert ptrtoint+inttoptr to a bitcast because it's shorter and
 // because some intrinsics work on bitcasts but not on
 // ptrtoint+inttoptr, in particular:
 //  * llvm.lifetime.start/end (although we strip these out)
 //  * llvm.eh.typeid.for
 static void SimplifyCasts(Instruction *Inst, Type *IntPtrType) {
@@ skipping 101 matching lines @@
   // various casts.
   for (Module::iterator Func = M.begin(), E = M.end(); Func != E; ++Func) {
     CleanUpFunction(Func, IntPtrType);
   }
   return true;
 }
 
 ModulePass *llvm::createReplacePtrsWithIntsPass() {
   return new ReplacePtrsWithInts();
 }