diff --git a/lib/TableGen/Operations.cpp b/lib/TableGen/Operations.cpp
index 0350219..6b4f4f9 100644
--- a/lib/TableGen/Operations.cpp
+++ b/lib/TableGen/Operations.cpp
@@ -322,7 +322,13 @@ void OperationBase::parseValueTraits(raw_ostream &errs, RecordTy *record,
   }
 
   const ListInit *List = record->getValueAsListInit("value_traits");
-  for (const Init *I : List->getValues()) {
+  for (const Init *I : List->
+#if LLVM_MAIN_REVISION && LLVM_MAIN_REVISION < 538013
+                       getValues()
+#else
+                       getElements()
+#endif
+  ) {
     if (const DagInit *DI = dyn_cast<DagInit>(I)) {
       if (DI->getNumArgs() != 1) {
         errs << "value_traits " << *DI << " is missing argument name";
@@ -840,7 +846,8 @@ void BuilderMethod::emitDefinition(raw_ostream &out, FmtContext &fmt,
     )",
                  &fmt);
   } else {
-    out << tgfmt("return ::llvm::cast<$_op>($_builder.CreateCall($fn, std::nullopt, $_instname));\n",
+    out << tgfmt("return ::llvm::cast<$_op>($_builder.CreateCall($fn, {}, "
+                 "$_instname));\n",
                  &fmt);
   }