diff --git a/llvm/unittests/CodeGen/GlobalISel/LegalizerHelperTest.cpp b/llvm/unittests/CodeGen/GlobalISel/LegalizerHelperTest.cpp
index 742a4c28d0a50..c9cf760029757 100644
--- a/llvm/unittests/CodeGen/GlobalISel/LegalizerHelperTest.cpp
+++ b/llvm/unittests/CodeGen/GlobalISel/LegalizerHelperTest.cpp
@@ -199,7 +199,7 @@ TEST_F(AArch64GISelMITest, LowerBitCountingCTTZ0) {
   LegalizerHelper Helper(*MF, Info, Observer, B);
   // Perform Legalization
   EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*MIBCTTZ, 0));
+            Helper.lower(*MIBCTTZ, 0, LLT::scalar(32)));
 
   auto CheckStr = R"(
   CHECK: [[CZU:%[0-9]+]]:_(s32) = G_CTTZ_ZERO_UNDEF %0
@@ -232,7 +232,7 @@ TEST_F(AArch64GISelMITest, LowerBitCountingCTTZ1) {
   // Perform Legalization
 
   EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*MIBCTTZ, 0));
+            Helper.lower(*MIBCTTZ, 0, LLT::scalar(64)));
 
   auto CheckStr = R"(
   CHECK: [[NEG1:%[0-9]+]]:_(s64) = G_CONSTANT i64 -1
@@ -337,7 +337,7 @@ TEST_F(AArch64GISelMITest, LowerBitCountingCTTZ2) {
 
   B.setInsertPt(*EntryMBB, MIBCTTZ->getIterator());
   EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*MIBCTTZ, 0));
+            Helper.lower(*MIBCTTZ, 0, LLT::scalar(64)));
 
   auto CheckStr = R"(
   CHECK: [[NEG1:%[0-9]+]]:_(s64) = G_CONSTANT i64 -1
@@ -437,7 +437,7 @@ TEST_F(AArch64GISelMITest, LowerBitCountingCTTZ3) {
   DummyGISelObserver Observer;
   LegalizerHelper Helper(*MF, Info, Observer, B);
   EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*MIBCTTZ, 0));
+            Helper.lower(*MIBCTTZ, 0, LLT::scalar(64)));
 
   auto CheckStr = R"(
   CHECK: CTTZ
@@ -464,7 +464,7 @@ TEST_F(AArch64GISelMITest, LowerBitCountingCTLZ0) {
   DummyGISelObserver Observer;
   LegalizerHelper Helper(*MF, Info, Observer, B);
   EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*MIBCTLZ, 0));
+            Helper.lower(*MIBCTLZ, 0, LLT::scalar(64)));
 
   auto CheckStr = R"(
   CHECK: [[CZU:%[0-9]+]]:_(s64) = G_CTLZ_ZERO_UNDEF %0
@@ -495,7 +495,7 @@ TEST_F(AArch64GISelMITest, LowerBitCountingCTLZLibcall) {
   DummyGISelObserver Observer;
   LegalizerHelper Helper(*MF, Info, Observer, B);
   EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*MIBCTLZ, 0));
+            Helper.lower(*MIBCTLZ, 0, LLT::scalar(32)));
 
   auto CheckStr = R"(
   CHECK: [[CZU:%[0-9]+]]:_(s32) = G_CTLZ_ZERO_UNDEF %0
@@ -528,7 +528,7 @@ TEST_F(AArch64GISelMITest, LowerBitCountingCTLZ1) {
   DummyGISelObserver Observer;
   LegalizerHelper Helper(*MF, Info, Observer, B);
   EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*MIBCTLZ, 0));
+            Helper.lower(*MIBCTLZ, 0, s8));
 
   auto CheckStr = R"(
   CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC
@@ -1604,7 +1604,7 @@ TEST_F(AArch64GISelMITest, LowerFNEG) {
             Helper.lower(*FNeg0, 0, LLT::scalar(64)));
   B.setInstr(*FNeg1);
   EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*FNeg1, 0));
+            Helper.lower(*FNeg1, 0, LLT::scalar(64)));
 
   auto CheckStr = R"(
   CHECK: [[FADD:%[0-9]+]]:_(s64) = nsz G_FADD %0:_, %1:_
@@ -1658,7 +1658,7 @@ TEST_F(AArch64GISelMITest, LowerMinMax) {
             Helper.lower(*UMin, 0, s64));
   B.setInstr(*UMax);
   EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*UMax, 0));
+            Helper.lower(*UMax, 0, s64));
 
   B.setInstr(*SMinV);
   EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
@@ -1671,7 +1671,7 @@ TEST_F(AArch64GISelMITest, LowerMinMax) {
             Helper.lower(*UMinV, 0, v2s32));
   B.setInstr(*UMaxV);
   EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
-            Helper.lower(*UMaxV, 0));
+            Helper.lower(*UMaxV, 0, v2s32));
 
   auto CheckStr = R"(
   CHECK: [[CMP0:%[0-9]+]]:_(s1) = G_ICMP intpred(slt), %0:_(s64), %1:_
diff --git a/llvm/unittests/Target/Z80/InstSizes.cpp b/llvm/unittests/Target/Z80/InstSizes.cpp
index adaf3df3e6739..3498b680f10ff 100644
--- a/llvm/unittests/Target/Z80/InstSizes.cpp
+++ b/llvm/unittests/Target/Z80/InstSizes.cpp
@@ -1,8 +1,7 @@
 #include "Z80Subtarget.h"
 #include "Z80TargetMachine.h"
-#include "llvm/ADT/STLArrayExtras.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/CodeGen/MIRParser/MIRParser.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineModuleInfo.h"
@@ -1480,7 +1479,7 @@ void checkInstructionSizes(StringRef T) {
   ASSERT_TRUE(TheTarget);
 
   std::unique_ptr<Z80TargetMachine> TM(static_cast<Z80TargetMachine *>(
-      TheTarget->createTargetMachine(TT, "generic", "", {}, None)));
+      TheTarget->createTargetMachine(TT, "generic", "", {}, std::nullopt)));
   ASSERT_TRUE(TM);
 
   Z80Subtarget STI(TM->getTargetTriple(), TM->getTargetCPU(),
@@ -1533,7 +1532,7 @@ void checkInstructionSizes(StringRef T) {
   ASSERT_TRUE(F);
   auto &MF = MMI.getOrCreateMachineFunction(*F);
 
-  ASSERT_EQ(MF.getInstructionCount(), array_lengthof(TestInstrs));
+  ASSERT_EQ(MF.getInstructionCount(), std::size(TestInstrs));
   auto TI = std::begin(TestInstrs);
   for (const auto &MBB : MF)
     for (const auto &MI : MBB) {