From 3410e08f53d0b2f58118f67efafa43eab8928e86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
Date: Wed, 26 Apr 2023 11:05:47 +0200
Subject: [PATCH] clover/llvm: Use std::nullopt already with LLVM 16

llvm::None is already deprecated and defined as std::nullopt in LLVM 16.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22718>
(cherry picked from commit dce97f090a74f6f46df7999601fc16cdabe97782)
---
 .pick_status.json                                    | 2 +-
 src/gallium/frontends/clover/llvm/codegen/native.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index fa06bac7828..ee4172ccf51 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1498,7 +1498,7 @@
         "description": "clover/llvm: Use std::nullopt already with LLVM 16",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/frontends/clover/llvm/codegen/native.cpp b/src/gallium/frontends/clover/llvm/codegen/native.cpp
index 9899bbe0af6..869f8c6e2af 100644
--- a/src/gallium/frontends/clover/llvm/codegen/native.cpp
+++ b/src/gallium/frontends/clover/llvm/codegen/native.cpp
@@ -116,7 +116,7 @@ namespace {
 
       std::unique_ptr<TargetMachine> tm {
          t->createTargetMachine(target.triple, target.cpu, "", {},
-#if LLVM_VERSION_MAJOR >= 17
+#if LLVM_VERSION_MAJOR >= 16
                                 std::nullopt, std::nullopt,
 #else
                                 ::llvm::None, ::llvm::None,