[Polly] Fix build after IRBuilder changes

Simply dropping the createPollyIRBuilder() function here, because
it doesn't do much. Also directly initialize Expander in
ScopExpander instead of going through the copy-constructor.

Author: nikic

polly/include/polly/CodeGen/IRBuilder.h

@@ -155,13 +155,5 @@ class IRInserter : protected llvm::IRBuilderDefaultInserter {
 // matches for certain names.
 typedef llvm::IRBuilder<llvm::ConstantFolder, IRInserter> PollyIRBuilder;
 
-/// Return an IR builder pointed before the @p BB terminator.
-static inline PollyIRBuilder createPollyIRBuilder(llvm::BasicBlock *BB,
-                                                  ScopAnnotator &LA) {
-  PollyIRBuilder Builder(BB->getContext(), llvm::ConstantFolder(),
-                         polly::IRInserter(LA));
-  Builder.SetInsertPoint(BB->getTerminator());
-  return Builder;
-}
 } // namespace polly
 #endif

polly/lib/CodeGen/CodeGeneration.cpp

@@ -207,7 +207,9 @@ static bool CodeGen(Scop &S, IslAstInfo &AI, LoopInfo &LI, DominatorTree &DT,
   assert(R->isSimple());
   BasicBlock *EnteringBB = S.getEnteringBlock();
   assert(EnteringBB);
-  PollyIRBuilder Builder = createPollyIRBuilder(EnteringBB, Annotator);
+  PollyIRBuilder Builder(EnteringBB->getContext(), ConstantFolder(),
+                         IRInserter(Annotator));
+  Builder.SetInsertPoint(EnteringBB->getTerminator());
 
   // Only build the run-time condition and parameters _after_ having
   // introduced the conditional branch. This is important as the conditional

polly/lib/CodeGen/PPCGCodeGeneration.cpp

@@ -3452,7 +3452,9 @@ class PPCGCodeGeneration : public ScopPass {
 
     BasicBlock *EnteringBB = R->getEnteringBlock();
 
-    PollyIRBuilder Builder = createPollyIRBuilder(EnteringBB, Annotator);
+    PollyIRBuilder Builder(EnteringBB->getContext(), ConstantFolder(),
+                           IRInserter(Annotator));
+    Builder.SetInsertPoint(EnteringBB->getTerminator());
 
     // Only build the run-time condition and parameters _after_ having
     // introduced the conditional branch. This is important as the conditional

polly/lib/Support/ScopHelper.cpp

@@ -243,7 +243,7 @@ struct ScopExpander : SCEVVisitor<ScopExpander, const SCEV *> {
   explicit ScopExpander(const Region &R, ScalarEvolution &SE,
                         const DataLayout &DL, const char *Name, ValueMapT *VMap,
                         BasicBlock *RTCBB)
-      : Expander(SCEVExpander(SE, DL, Name)), SE(SE), Name(Name), R(R),
+      : Expander(SE, DL, Name), SE(SE), Name(Name), R(R),
         VMap(VMap), RTCBB(RTCBB) {}
 
   Value *expandCodeFor(const SCEV *E, Type *Ty, Instruction *I) {