make sure Lincoln is not a rhino

Author: bcardosolopes

mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td

@@ -1443,7 +1443,7 @@ def LLVM_GlobalCtorsOp : LLVM_Op<"mlir.global_ctors", [
                        ArrayAttr:$data);
   let summary = "LLVM dialect global_ctors.";
   let description = [{
-    Specifies a list of constructor functions, priorities and associated data.
+    Specifies a list of constructor functions, priorities, and associated data.
     The functions referenced by this array will be called in ascending order
     of priority (i.e. lowest first) when the module is loaded. The order of
     functions with the same priority is not defined. This operation is

mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp

@@ -2513,7 +2513,7 @@ LogicalResult checkGlobalXtorData(Operation *op, ArrayAttr data) {
     return success();
 
   if (llvm::all_of(data.getAsRange<Attribute>(), [](Attribute v) {
-        return isa<FlatSymbolRefAttr>(v) || isa<ZeroAttr>(v);
+        return isa<FlatSymbolRefAttr, ZeroAttr>(v);
       }))
     return success();
   return op->emitError("data element must be symbol or #llvm.zero");
@@ -2537,7 +2537,7 @@ LogicalResult GlobalCtorsOp::verify() {
       getCtors().size() == getData().size())
     return success();
   return emitError(
-      "ctors, priorities and data must have the same number of elements");
+      "ctors, priorities, and data must have the same number of elements");
 }
 
 //===----------------------------------------------------------------------===//
@@ -2562,7 +2562,7 @@ LogicalResult GlobalDtorsOp::verify() {
       getDtors().size() == getData().size())
     return success();
   return emitError(
-      "dtors, priorities and data must have the same number of elements");
+      "dtors, priorities, and data must have the same number of elements");
 }
 
 //===----------------------------------------------------------------------===//

mlir/test/Dialect/LLVMIR/invalid.mlir

@@ -9,7 +9,7 @@ llvm.func @ctor() {
   llvm.return
 }
 
-// expected-error@+1{{ctors, priorities and data must have the same number of elements}}
+// expected-error@+1{{ctors, priorities, and data must have the same number of elements}}
 llvm.mlir.global_ctors ctors = [@ctor], priorities = [], data = [#llvm.zero]
 
 // -----
@@ -18,7 +18,7 @@ llvm.func @dtor() {
   llvm.return
 }
 
-// expected-error@+1{{dtors, priorities and data must have the same number of elements}}
+// expected-error@+1{{dtors, priorities, and data must have the same number of elements}}
 llvm.mlir.global_dtors dtors = [@dtor], priorities = [0 : i32, 32767 : i32], data = [#llvm.zero]
 
 // -----