[llvm][Support] Add indirection to call correct validate(...) function

[arrv-sc]

Previously "yamlize" overload for validatedMappingTraits was
unconditionally calling "MappingTraits<T>::validate" even if
"MappingContextTraits<T, Context>" was passed to it. Therefore
compilation failed when specifying
"MappingContextTraits<T,Context>::validate()"

[llvmbot]

@llvm/pr-subscribers-llvm-support

Author: None (arrv-sc)

Changes

Previously "yamlize" overload for validatedMappingTraits was
unconditionally calling "MappingTraits<T>::validate" even if
"MappingContextTraits<T, Context>" was passed to it. Therefore
compilation failed when specifying
"MappingContextTraits<T,Context>::validate()"

---

Full diff: https://github.com/llvm/llvm-project/pull/71966.diff

1 Files Affected:

• (modified) llvm/include/llvm/Support/YAMLTraits.h (+15-2)

diff --git a/llvm/include/llvm/Support/YAMLTraits.h b/llvm/include/llvm/Support/YAMLTraits.h
index 99074105a556989..86226ef46cf5482 100644
--- a/llvm/include/llvm/Support/YAMLTraits.h
+++ b/llvm/include/llvm/Support/YAMLTraits.h
@@ -1058,6 +1058,19 @@ yamlize(IO &io, T &Val, bool, EmptyContext &Ctx) {
   }
 }
 
+template <typename T, typename Context,
+          std::enable_if_t<validatedMappingTraits<T, Context>::value, int> = 0>
+std::string callValidate(IO &io, T &Val, Context &Ctx) {
+  return MappingContextTraits<T, Context>::validate(io, Val, Ctx);
+}
+
+template <
+    typename T,
+    std::enable_if_t<validatedMappingTraits<T, EmptyContext>::value, int> = 0>
+std::string callValidate(IO &io, T &Val, EmptyContext = {}) {
+  return MappingTraits<T>::validate(io, Val);
+}
+
 template <typename T, typename Context>
 std::enable_if_t<validatedMappingTraits<T, Context>::value, void>
 yamlize(IO &io, T &Val, bool, Context &Ctx) {
@@ -1066,7 +1079,7 @@ yamlize(IO &io, T &Val, bool, Context &Ctx) {
   else
     io.beginMapping();
   if (io.outputting()) {
-    std::string Err = MappingTraits<T>::validate(io, Val);
+    std::string Err = callValidate(io, Val, Ctx);
     if (!Err.empty()) {
       errs() << Err << "\n";
       assert(Err.empty() && "invalid struct trying to be written as yaml");
@@ -1074,7 +1087,7 @@ yamlize(IO &io, T &Val, bool, Context &Ctx) {
   }
   detail::doMapping(io, Val, Ctx);
   if (!io.outputting()) {
-    std::string Err = MappingTraits<T>::validate(io, Val);
+    std::string Err = callValidate(io, Val, Ctx);
     if (!Err.empty())
       io.setError(Err);
   }

[arrv-sc]

Small patch that makes it possible to use validate(....) in llvm::yaml::ContextMappingTraits.

[arrv-sc]

@RKSimon could you please take a look?

[arrv-sc]

@aaupov Could you take a look please?

[aaupov]

I'm sorry but I'm unfamiliar with the code.

[github-actions]

:white_check_mark: With the latest revision this PR passed the C/C++ code formatter.

[arrv-sc]

@RKSimon, @topperc, take a look please

[RKSimon]

SGTM

[arrv-sc]

@topperc

[arrv-sc]

@topperc, please, review

[arrv-sc]

I would highly appreciate you taking a look on this PR @topperc

[topperc]

Is this a similar problem to what detail::doMapping is solving for the mapping function? Perhaps we could structure this the same way for consistency?

[arrv-sc]

Is this a similar problem to what detail::doMapping is solving for the mapping function? Perhaps we could structure this the same way for consistency?

I actually agree with you. Updated.

[topperc]

LGTM

[arrv-sc]

@RKSimon, merge?

[RKSimon]

@RKSimon, merge?

LGTM - do you mean you want me to merge it for you?

[arrv-sc]

LGTM - do you mean you want me to merge it for you?

Yes. Sorry if I'm not clear