Changes from 3.7 merge to files not in upstream

lib/Transforms/MinSFI/MinSFI.cpp

 //===-- MinSFI.cpp - Lists MinSFI sandboxing passes -----------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements the meta-pass "-minsfi". It lists its constituent
 // passes and explains the reasons for their ordering.
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/PassManager.h"
+#include "llvm/IR/LegacyPassManager.h"
 #include "llvm/Analysis/NaCl.h"
 #include "llvm/Transforms/MinSFI.h"
 
 using namespace llvm;
 
 void llvm::MinSFIPasses(PassManagerBase &PM) {
   // Nondeterminism is generally undesirable in sandboxed code but more
   // importantly, use of undefined values can leak protected data. This pass
   // replaces all undefs with predefined constants. It only modifies operands
   // of instructions and therefore is not dependent on any other MinSFI or
@@ skipping 33 matching lines @@
   // All passes running before this one do not have to be trusted in this
   // respect. Passes running later must not break the guarantee.
   PM.add(createSandboxMemoryAccessesPass());
 
   // Lastly, we apply CFI sandboxing on indirect calls. The pass creates
   // tables of address-taken functions and replaces function pointers with
   // indices into the tables. This pass is invoked after SFI because it is
   // crucial that the tables cannot be modified by the sandboxed code.
   PM.add(createSandboxIndirectCallsPass());
 }