Apply suggestions to PR

Co-Authored-By: Vassil Vassilev <[email protected]>

Author: mcbarton

lib/Interpreter/Compatibility.h

@@ -12,8 +12,11 @@
 
 #if CLANG_VERSION_MAJOR < 19
 #define Template_Deduction_Result Sema::TemplateDeductionResult
+#define Template_Deduction_Result_Success                                      \
+  Sema::TemplateDeductionResult::TDK_Success
 #else
 #define Template_Deduction_Result TemplateDeductionResult
+#define Template_Deduction_Result_Success TemplateDeductionResult::Success
 #endif
 
 #if CLANG_VERSION_MAJOR < 19

lib/Interpreter/CppInterOp.cpp

@@ -2880,7 +2880,7 @@ namespace Cpp {
       Template_Deduction_Result Result = S.DeduceTemplateArguments(
           FunctionTemplate, &TLI, Specialization, Info,
           /*IsAddressOfFunction*/ true);
-      if (static_cast<int>(Result)) {
+      if (Result != Template_Deduction_Result_Success) {
         // FIXME: Diagnose what happened.
         (void)Result;
       }

unittests/CppInterOp/ScopeReflectionTest.cpp

@@ -772,10 +772,10 @@ template<class T> constexpr T pi = T(3.1415926535897932385L);
   VarTemplateDecl* VDTD1 = VD->getSpecializedTemplate();
   EXPECT_TRUE(VDTD1->isThisDeclarationADefinition());
 #if CLANG_VERSION_MAJOR > 13
-#if CLANG_VERSION_MAJOR > 18
-  TemplateArgument TA1 = (*VD->getTemplateArgsAsWritten())[0].getArgument();
-#else
+#if CLANG_VERSION_MAJOR <= 18
   TemplateArgument TA1 = (*VD->getTemplateArgsInfo())[0].getArgument();
+#else
+  TemplateArgument TA1 = (*VD->getTemplateArgsAsWritten())[0].getArgument();
 #endif // CLANG_VERSION_MAJOR
 #else
   TemplateArgument TA1 = VD->getTemplateArgsInfo()[0].getArgument();