Merge remote-tracking branch 'origin/master'

1 files changed, 9 insertions, 8 deletions

diff --git a/include/llvm/Transforms/NaCl.h b/include/llvm/Transforms/NaCl.h
index 43adb237dd..ec1a54aaa8 100644
--- a/include/llvm/Transforms/NaCl.h
+++ b/include/llvm/Transforms/NaCl.h
@@ -22,30 +22,31 @@ class PassManager;
 class Use;
 class Value;
 
+BasicBlockPass *createExpandGetElementPtrPass();
+BasicBlockPass *createPromoteI1OpsPass();
+FunctionPass *createExpandConstantExprPass();
+FunctionPass *createExpandStructRegsPass();
+FunctionPass *createInsertDivideCheckPass();
+FunctionPass *createPromoteIntegersPass();
+FunctionPass *createResolvePNaClIntrinsicsPass();
 ModulePass *createAddPNaClExternalDeclsPass();
 ModulePass *createCanonicalizeMemIntrinsicsPass();
 ModulePass *createExpandArithWithOverflowPass();
 ModulePass *createExpandByValPass();
-FunctionPass *createExpandConstantExprPass();
 ModulePass *createExpandCtorsPass();
-BasicBlockPass *createExpandGetElementPtrPass();
 ModulePass *createExpandSmallArgumentsPass();
-FunctionPass *createExpandStructRegsPass();
-ModulePass *createExpandTlsPass();
 ModulePass *createExpandTlsConstantExprPass();
+ModulePass *createExpandTlsPass();
 ModulePass *createExpandVarArgsPass();
 ModulePass *createFlattenGlobalsPass();
 ModulePass *createGlobalCleanupPass();
-BasicBlockPass *createPromoteI1OpsPass();
-FunctionPass *createPromoteIntegersPass();
 ModulePass *createReplacePtrsWithIntsPass();
 ModulePass *createResolveAliasesPass();
-FunctionPass *createResolvePNaClIntrinsicsPass();
+ModulePass *createRewriteAtomicsPass();
 ModulePass *createRewriteLLVMIntrinsicsPass();
 ModulePass *createRewritePNaClLibraryCallsPass();
 ModulePass *createStripAttributesPass();
 ModulePass *createStripMetadataPass();
-FunctionPass *createInsertDivideCheckPass();
 
 void PNaClABISimplifyAddPreOptPasses(PassManager &PM);
 void PNaClABISimplifyAddPostOptPasses(PassManager &PM);