fix weird merge issue

VyacheslavLevytskyy · VyacheslavLevytskyy · commit c7a8975d2beb · 2024-09-23T06:27:19.000-07:00
diff --git a/llvm/lib/Target/SPIRV/SPIRVUtils.cpp b/llvm/lib/Target/SPIRV/SPIRVUtils.cpp
@@ -589,6 +589,8 @@ bool sortBlocks(Function &F) {
   }
 
   return Modified;
+}
+
 MachineInstr *getVRegDef(MachineRegisterInfo &MRI, Register Reg) {
   MachineInstr *MaybeDef = MRI.getVRegDef(Reg);
   if (MaybeDef && MaybeDef->getOpcode() == SPIRV::ASSIGN_TYPE)

Original file line number	Diff line number	Diff line change
`@@ -589,6 +589,8 @@ bool sortBlocks(Function &F) {`
`589`	`589`	`}`
`590`	`590`
`591`	`591`	`return Modified;`
	`592`	`+}`
	`593`	`+`
`592`	`594`	`MachineInstr *getVRegDef(MachineRegisterInfo &MRI, Register Reg) {`
`593`	`595`	`MachineInstr *MaybeDef = MRI.getVRegDef(Reg);`
`594`	`596`	`if (MaybeDef && MaybeDef->getOpcode() == SPIRV::ASSIGN_TYPE)`