resolve merge conflicts
diff --git a/llvm/include/llvm/CodeGen/MIRFSDiscriminator.h b/llvm/include/llvm/CodeGen/MIRFSDiscriminator.h
index 1f157e3..f561adc 100644
--- a/llvm/include/llvm/CodeGen/MIRFSDiscriminator.h
+++ b/llvm/include/llvm/CodeGen/MIRFSDiscriminator.h
@@ -63,9 +63,11 @@
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 692d4d4..6f96597 100644
--- a/llvm/lib/Passes/PassBuilder.cpp
+++ b/llvm/lib/Passes/PassBuilder.cpp
@@ -1434,11 +1434,10 @@
inconvertibleErrorCode());
}
-<<<<<<< HEAD
Expected<bool> parseMachineSinkingPassOptions(StringRef Params) {
return PassBuilder::parseSinglePassOption(Params, "enable-sink-fold",
"MachineSinkingPass");
- }
+}
Expected<FSDiscriminatorPass>
parseFSDiscriminatorPassOptions(PassBuilder &PB, StringRef Params) {
