Revert new add/sub narrowing conditional to avoid test failures for now

calc84maniac · calc84maniac · commit 9257fd038e07 · 2024-11-19T04:57:08.000-05:00
diff --git a/llvm/lib/Target/Z80/GISel/Z80LegalizerInfo.cpp b/llvm/lib/Target/Z80/GISel/Z80LegalizerInfo.cpp
@@ -428,9 +428,8 @@ Z80LegalizerInfo::legalizeAddSub(LegalizerHelper &Helper, MachineInstr &MI,
   }
   if (LegalSize)
     return LegalizerHelper::Legalized;
-  if ((!F.hasOptSize() || MI.getOpcode() == G_ADD) &&
-      Size == (Subtarget.is24Bit() ? 48 : 32))
-    return Helper.narrowScalar(MI, 0, LLT::scalar(Size / 2));
+  if (Subtarget.is24Bit() && Size == 48)
+    return Helper.narrowScalar(MI, 0, LLT::scalar(24));
   return Helper.libcall(MI, LocObserver);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -428,9 +428,8 @@ Z80LegalizerInfo::legalizeAddSub(LegalizerHelper &Helper, MachineInstr &MI,`
`428`	`428`	`}`
`429`	`429`	`if (LegalSize)`
`430`	`430`	`return LegalizerHelper::Legalized;`
`431`		`- if ((!F.hasOptSize() \|\| MI.getOpcode() == G_ADD) &&`
`432`		`- Size == (Subtarget.is24Bit() ? 48 : 32))`
`433`		`- return Helper.narrowScalar(MI, 0, LLT::scalar(Size / 2));`
	`431`	`+ if (Subtarget.is24Bit() && Size == 48)`
	`432`	`+ return Helper.narrowScalar(MI, 0, LLT::scalar(24));`
`434`	`433`	`return Helper.libcall(MI, LocObserver);`
`435`	`434`	`}`
`436`	`435`