commit 27640a5684f2d6e6c82f09e42db52eed3a026bad
author Christian Sigg <csigg@google.com> Mon Sep 16 07:45:13 2019 -0700
committer TensorFlower Gardener <gardener@tensorflow.org> Mon Sep 16 07:51:17 2019 -0700
tree 70b7410c4336e379f6ccd1301579621f72b68cb3
parent b2b3f4735dad28cca5689dd02bb970955037438d

Unify how errors are emitted in LaunchFuncOp verification.

PiperOrigin-RevId: 269331869

third_party/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp

diff --git a/third_party/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp b/third_party/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp
index 5609725..49db4e6 100644
--- a/third_party/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp
+++ b/third_party/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp
@@ -143,7 +143,7 @@
   if (!getBody().empty()) {
     Block &entryBlock = getBody().front();
     if (entryBlock.getNumArguments() != kNumConfigOperands + getNumOperands())
-      return emitError("unexpected number of region arguments");
+      return emitOpError("unexpected number of region arguments");
   }
 
   // Block terminators without successors are expected to exit the kernel region
@@ -437,11 +437,11 @@
   auto module = getParentOfType<ModuleOp>();
   FuncOp kernelFunc = module.lookupSymbol<FuncOp>(kernel());
   if (!kernelFunc)
-    return emitError() << "kernel function '" << kernelAttr << "' is undefined";
+    return emitOpError("kernel function '") << kernelAttr << "' is undefined";
 
   if (!kernelFunc.getAttrOfType<mlir::UnitAttr>(
           GPUDialect::getKernelFuncAttrName())) {
-    return emitError("kernel function is missing the '")
+    return emitOpError("kernel function is missing the '")
            << GPUDialect::getKernelFuncAttrName() << "' attribute";
   }
   unsigned numKernelFuncArgs = kernelFunc.getNumArguments();