Use InsertPointGuard instead of manual save/restore.

It has the extra benefit of saving/restoring the debug location which otherwise could be lost.

Author: abidh

llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp

@@ -6585,6 +6585,8 @@ static Function *createOutlinedFunction(
       ParameterTypes.push_back(Arg->getType());
   }
 
+  // Save insert point.
+  IRBuilder<>::InsertPointGuard IPG(Builder);
   auto BB = Builder.GetInsertBlock();
   auto M = BB->getModule();
   auto FuncType = FunctionType::get(Builder.getVoidTy(), ParameterTypes,
@@ -6621,9 +6623,6 @@ static Function *createOutlinedFunction(
     }
   }
 
-  // Save insert point.
-  auto OldInsertPoint = Builder.saveIP();
-
   // Generate the region into the function.
   BasicBlock *EntryBB = BasicBlock::Create(Builder.getContext(), "entry", Func);
   Builder.SetInsertPoint(EntryBB);
@@ -6729,9 +6728,6 @@ static Function *createOutlinedFunction(
   for (auto Deferred : DeferredReplacement)
     ReplaceValue(std::get<0>(Deferred), std::get<1>(Deferred), Func);
 
-  // Restore insert point.
-  Builder.restoreIP(OldInsertPoint);
-
   return Func;
 }