Use ArgumentIndex enum

Instead of inserting the index value, use the enum value from
ArgumentIndex.

Author: Thomas Symalla

lib/TableGen/Operations.cpp

@@ -215,17 +215,18 @@ void AccessorBuilder::emitGetterDefinition() const {
   std::string fromLlvm;
 
   if (!m_arg.type->isVarArgList()) {
-    fromLlvm = tgfmt("getArgOperand($index)", &m_fmt);
+    fromLlvm = tgfmt(
+        "getArgOperand(static_cast<uint32_t>(ArgumentIndex::$Name))", &m_fmt);
     if (auto *attr = dyn_cast<Attr>(m_arg.type))
       fromLlvm = tgfmt(attr->getFromLlvmValue(), &m_fmt, fromLlvm);
     else if (m_arg.type->isTypeArg())
       fromLlvm += "->getType()";
   } else {
     fromLlvm = tgfmt(
         R"(::llvm::make_range(
-            value_op_iterator(arg_begin() + $index),
+            value_op_iterator(arg_begin() + static_cast<uint32_t>(ArgumentIndex::$Name$0)),
             value_op_iterator(arg_end())))",
-        &m_fmt);
+        &m_fmt, "Start");
   }
 
   m_fmt.addSubst("fromLlvm", fromLlvm);
@@ -251,7 +252,7 @@ void AccessorBuilder::emitSetterDefinition() const {
   m_os << tgfmt(R"(
 
       void $_op::set$Name($cppType $name) {
-        setArgOperand($index, $toLlvm);
+        setArgOperand(static_cast<uint32_t>(ArgumentIndex::$Name), $toLlvm);
       })",
                 &m_fmt);
 }
@@ -263,32 +264,27 @@ void AccessorBuilder::emitVarArgReplacementDefinition() const {
 
       $_op *$_op::replace$Name(::llvm::ArrayRef<Value *> $name) {
         ::llvm::SmallVector<Value *> newArgs;
-        if ($index > 0)
-          newArgs.append(arg_begin(), arg_begin() + $index);
+        if (static_cast<uint32_t>(ArgumentIndex::$Name$0) > 0)
+          newArgs.append(arg_begin(), arg_begin() + static_cast<uint32_t>(ArgumentIndex::$Name$0));
         newArgs.append($name.begin(), $name.end());
         $_op *newOp = ::llvm::cast<$_op>(::llvm::CallInst::Create(getCalledFunction(), newArgs, this->getName(), this->getIterator()));
         newOp->copyMetadata(*this);
         this->replaceAllUsesWith(newOp);
         this->eraseFromParent();
         return newOp;
       })",
-                &m_fmt);
+                &m_fmt, "Start");
 }
 
 void OperationBase::emitArgumentAccessorDefinitions(llvm::raw_ostream &out,
                                                     FmtContext &fmt) const {
-  unsigned numSuperclassArgs = 0;
-  if (m_superclass)
-    numSuperclassArgs = m_superclass->getNumFullArguments();
-
   for (const auto &indexedArg : llvm::enumerate(m_arguments)) {
     FmtContextScope scope(fmt);
 
     const NamedValue &arg = indexedArg.value();
     AccessorBuilder builder{fmt, out, arg, m_attrTypes[indexedArg.index()]};
 
     fmt.withContext("getContext()");
-    fmt.addSubst("index", Twine(numSuperclassArgs + indexedArg.index()));
     fmt.addSubst("cppType", arg.type->getGetterCppType());
     fmt.addSubst("name", arg.name);
     fmt.addSubst("Name", convertToCamelFromSnakeCase(arg.name, true));
@@ -342,7 +338,8 @@ static std::string evaluateAttrLlvmType(raw_ostream &errs, raw_ostream &out,
 }
 
 // Implement constructor here, where BuilderMethod is fully defined.
-Operation::Operation(GenDialectsContext &context) : m_system(context, m_scope) {}
+Operation::Operation(GenDialectsContext &context)
+    : m_system(context, m_scope) {}
 
 // Default destructor instantiated explicitly to avoid having to add more
 // includes in the header.
@@ -790,7 +787,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, "
+                 "std::nullopt, $_instname));\n",
                  &fmt);
   }