resolve merge conflictsusers/optimisan/port-mirfs-discriminator

2 files changed, 3 insertions, 2 deletions

diff --git a/llvm/include/llvm/CodeGen/MIRFSDiscriminator.h b/llvm/include/llvm/CodeGen/MIRFSDiscriminator.h
index 1f157e35bb00..f561adc49e5e 100644
--- a/llvm/include/llvm/CodeGen/MIRFSDiscriminator.h
+++ b/llvm/include/llvm/CodeGen/MIRFSDiscriminator.h
@@ -63,9 +63,11 @@ class MIRAddFSDiscriminatorsLegacy : public MachineFunctionPass {
 
 public:
   static char ID;
+
   MIRAddFSDiscriminatorsLegacy(
       FSDiscriminatorPass P = FSDiscriminatorPass::Pass1)
       : MachineFunctionPass(ID), Pass(P) {}
+
   StringRef getPassName() const override {
     return "Add FS discriminators in MIR";
   }
diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp
index 692d4d4a685b..6f96597f9c9e 100644
--- a/llvm/lib/Passes/PassBuilder.cpp
+++ b/llvm/lib/Passes/PassBuilder.cpp
@@ -1434,11 +1434,10 @@ parseRegAllocGreedyFilterFunc(PassBuilder &PB, StringRef Params) {
       inconvertibleErrorCode());
 }
 
-<<<<<<< HEAD
 Expected<bool> parseMachineSinkingPassOptions(StringRef Params) {
   return PassBuilder::parseSinglePassOption(Params, "enable-sink-fold",
                                             "MachineSinkingPass");
-  }
+}
 
 Expected<FSDiscriminatorPass>
 parseFSDiscriminatorPassOptions(PassBuilder &PB, StringRef Params) {