From 91884c6f976fe9377bfe9d518b2bb5738762907a Mon Sep 17 00:00:00 2001
From: "Kazushi (Jam) Marukawa" <marukawa@nec.com>
Date: Tue, 19 Sep 2023 10:24:04 +0900
Subject: [PATCH] [VE] Solve conflicts

---
 llvm/unittests/Target/VE/MachineInstrTest.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llvm/unittests/Target/VE/MachineInstrTest.cpp b/llvm/unittests/Target/VE/MachineInstrTest.cpp
index b472ab8ba180..2bf1e98a14c1 100644
--- a/llvm/unittests/Target/VE/MachineInstrTest.cpp
+++ b/llvm/unittests/Target/VE/MachineInstrTest.cpp
@@ -285,7 +285,7 @@ TEST(VETest, VLIndex) {
   auto TM = std::unique_ptr<LLVMTargetMachine>(
     static_cast<LLVMTargetMachine*>(
       T->createTargetMachine(TT, "ve", "", Options, std::nullopt, std::nullopt,
-                             CodeGenOpt::Default)));
+                             CodeGenOptLevel::Default)));
   VESubtarget ST(TM->getTargetTriple(), std::string(TM->getTargetCPU()),
                  std::string(TM->getTargetFeatureString()),
                  *static_cast<const VETargetMachine *>(TM.get()));