Update printer and parser

Author: jpienaar

mlir/include/mlir/IR/BuiltinDialectBytecode.td

@@ -100,7 +100,7 @@ def FileLineColRange : DialectAttribute<(attr
   StringAttr:$filename,
   WithBuilder<"$_args",
     WithType<"SmallVector<uint64_t>",
-    WithParser <"succeeded(readFileLineColRangeLocs($_reader, $_var))",
+    WithParser<"succeeded(readFileLineColRangeLocs($_reader, $_var))",
     WithPrinter<"writeFileLineColRangeLocs($_writer, $_name)">>>>:$rawLocData
 )> {
   let cBuilder = "getFileLineColRange(context, filename, rawLocData)";
@@ -109,8 +109,8 @@ def FileLineColRange : DialectAttribute<(attr
 
 def FileLineColLoc : DialectAttribute<(attr
   StringAttr:$filename,
-  PresentOptionalVarInt:$start_line,
-  PresentOptionalVarInt:$start_column
+  VarInt:$start_line,
+  VarInt:$start_column
 )> {
   let printerPredicate = "::llvm::isa<FileLineColLoc>($_val)";
 }

mlir/include/mlir/IR/BuiltinLocationAttributes.td

@@ -143,10 +143,10 @@ def FileLineColRange : Builtin_LocationAttr<"FileLineColRange"> {
 
   let extraClassDeclaration = [{
     ::mlir::StringAttr getFilename() const;
-    std::optional<unsigned> getStartLine() const;
-    std::optional<unsigned> getStartColumn() const;
-    std::optional<unsigned> getEndColumn() const;
-    std::optional<unsigned> getEndLine() const;
+    unsigned getStartLine() const;
+    unsigned getStartColumn() const;
+    unsigned getEndColumn() const;
+    unsigned getEndLine() const;
   }];
   let skipDefaultBuilders = 1;
   let genAccessors = 0;

mlir/include/mlir/IR/BytecodeBase.td

@@ -82,12 +82,6 @@ def VarInt :
   WithBuilder<"$_args",
   WithPrinter<"$_writer.writeVarInt($_getter)",
   WithType   <"uint64_t">>>>;
-// This is for optional ints which are guaranteed to be present.
-def PresentOptionalVarInt :
-  WithParser <"succeeded($_reader.readVarInt($_var))",
-  WithBuilder<"$_args",
-  WithPrinter<"$_writer.writeVarInt(*$_getter)",
-  WithType   <"uint64_t">>>>;
 def SignedVarInt :
   WithParser <"succeeded($_reader.readSignedVarInt($_var))",
   WithBuilder<"$_args",

mlir/lib/IR/AsmPrinter.cpp

@@ -2014,16 +2014,27 @@ void AsmPrinter::Impl::printLocationInternal(LocationAttr loc, bool pretty,
           os << loc.getFilename().getValue();
         else
           printEscapedString(loc.getFilename());
-        os << ':' << *loc.getStartLine();
-        if (loc.getStartColumn()) {
-          os << ':' << *loc.getStartColumn();
-          if (loc.getEndColumn().has_value() || loc.getEndLine().has_value())
-            os << " to ";
-          if (loc.getEndLine().has_value())
-            os << *loc.getEndLine();
-          if (loc.getEndColumn().has_value())
-            os << ':' << *loc.getEndColumn();
+        if (loc.getStartLine() == loc.getStartColumn() == loc.getEndLine() ==
+            loc.getEndColumn() == 0) {
+          return;
+        }
+        if (loc.getStartColumn() == 0 &&
+            loc.getStartLine() == loc.getEndLine()) {
+          os << ':' << loc.getStartLine();
+          return;
+        }
+        if (loc.getEndColumn() == loc.getStartColumn() &&
+            loc.getStartLine() == loc.getEndLine()) {
+          os << ':' << loc.getStartLine() << ':' << loc.getStartColumn();
+          return;
+        }
+        if (loc.getStartLine() == loc.getEndLine()) {
+          os << ':' << loc.getStartLine() << ':' << loc.getStartColumn()
+             << " to :" << loc.getEndColumn();
+          return;
         }
+        os << ':' << loc.getStartLine() << ':' << loc.getStartColumn() << " to "
+           << loc.getEndLine() << ':' << loc.getEndColumn();
       })
       .Case<NameLoc>([&](NameLoc loc) {
         printEscapedString(loc.getName());

mlir/lib/IR/BuiltinDialectBytecode.cpp

@@ -126,7 +126,7 @@ static void writeFileLineColRangeLocs(DialectBytecodeWriter &writer,
   }
   // The single file:line:col is handled by other writer, but checked here for
   // completeness.
-  if (range.endColumn() == range.startColumn() &&
+  if (range.getEndColumn() == range.getStartColumn() &&
       range.getStartLine() == range.getEndLine()) {
     writer.writeVarInt(2);
     writer.writeVarInt(range.getStartLine());

mlir/lib/IR/Location.cpp

@@ -173,9 +173,9 @@ StringAttr FileLineColLoc::getFilename() const {
   return FileLineColRange::getFilename();
 }
 
-unsigned FileLineColLoc::getLine() const { return *getStartLine(); }
+unsigned FileLineColLoc::getLine() const { return getStartLine(); }
 
-unsigned FileLineColLoc::getColumn() const { return *getStartColumn(); }
+unsigned FileLineColLoc::getColumn() const { return getStartColumn(); }
 
 bool FileLineColLoc::classof(Attribute attr) {
   // This could also have been for <= 2. But given this is matching previous