[llvm] 65abca4 - [MLGO] Fix InlineAdvisor and ModelUnderTrainingRunner after hasValue removal

[Aiden Grossman via llvm-commits]

Author: Aiden Grossman
Date: 2022-11-24T03:48:34Z
New Revision: 65abca4611256794176b791a1380ad83ccf0741f

URL: https://github.com/llvm/llvm-project/commit/65abca4611256794176b791a1380ad83ccf0741f
DIFF: https://github.com/llvm/llvm-project/commit/65abca4611256794176b791a1380ad83ccf0741f.diff

LOG: [MLGO] Fix InlineAdvisor and ModelUnderTrainingRunner after hasValue removal

Recentlyin 4b6b248, llvm::Optional's hasValue method was removed as
described in
https://discourse.llvm.org/deprecating-llvm-optional-x-hasvalue-getvalue-getvalueor
This breaks InlineAdvisor and ModelUnderTrainingRunner. This patch fixes
them by changing the method to has_value, which hasValue was evaluating
to before.

Differential Revision: https://reviews.llvm.org/D138635

Added: 
    

Modified: 
    llvm/lib/Analysis/InlineAdvisor.cpp
    llvm/lib/Analysis/ModelUnderTrainingRunner.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Analysis/InlineAdvisor.cpp b/llvm/lib/Analysis/InlineAdvisor.cpp
index 3fafc3057a13..3642d316c0fb 100644
--- a/llvm/lib/Analysis/InlineAdvisor.cpp
+++ b/llvm/lib/Analysis/InlineAdvisor.cpp
@@ -217,7 +217,7 @@ bool InlineAdvisorAnalysis::Result::tryCreate(
     Advisor =
         llvm::getDevelopmentModeAdvisor(M, MAM, [&FAM, Params](CallBase &CB) {
           auto OIC = getDefaultInlineAdvice(CB, FAM, Params);
-          return OIC.hasValue();
+          return OIC.has_value();
         });
 #endif
     break;

diff  --git a/llvm/lib/Analysis/ModelUnderTrainingRunner.cpp b/llvm/lib/Analysis/ModelUnderTrainingRunner.cpp
index dc149f326271..2fe69cd16d58 100644
--- a/llvm/lib/Analysis/ModelUnderTrainingRunner.cpp
+++ b/llvm/lib/Analysis/ModelUnderTrainingRunner.cpp
@@ -40,7 +40,7 @@ ModelUnderTrainingRunner::ModelUnderTrainingRunner(
 
 void *ModelUnderTrainingRunner::evaluateUntyped() {
   LastEvaluationResult = Evaluator->evaluate();
-  if (!LastEvaluationResult.hasValue()) {
+  if (!LastEvaluationResult.has_value()) {
     Ctx.emitError("Error evaluating model.");
     return nullptr;
   }