Remove trailing_semicolon attribute

Author: Simon Camphausen

mlir/include/mlir/Dialect/EmitC/IR/EmitC.td

@@ -548,8 +548,7 @@ def EmitC_VerbatimOp : EmitC_Op<"verbatim"> {
   let summary = "Verbatim operation";
   let description = [{
     The `verbatim` operation produces no results and the value is emitted as is
-    durung translation. If `trailing_semicolon` is present an additional 
-    semicolon is emitted.
+    followed by a '\n' character during translation.
 
     Note: Use with caution. This operation can have arbitrary effects on the
     semantics of the emitted code. Use semantically more meaningful operations
@@ -579,8 +578,7 @@ def EmitC_VerbatimOp : EmitC_Op<"verbatim"> {
     StrAttr:$value,
     UnitAttr:$trailing_semicolon
   );
-  let assemblyFormat = "$value (`trailing_semicolon` $trailing_semicolon^)? attr-dict";
-  let hasVerifier = 1;
+  let assemblyFormat = "$value attr-dict";
 }
 
 def EmitC_AssignOp : EmitC_Op<"assign", []> {

mlir/lib/Dialect/EmitC/IR/EmitC.cpp

@@ -584,17 +584,6 @@ LogicalResult emitc::VariableOp::verify() {
   return verifyInitializationAttribute(getOperation(), getValueAttr());
 }
 
-//===----------------------------------------------------------------------===//
-// VerbatimOp
-//===----------------------------------------------------------------------===//
-
-LogicalResult emitc::VerbatimOp::verify() {
-  if (getValue().back() == ';')
-    return emitOpError() << "';' not allowed as the last character, use the "
-                            "`trailing_semicolon` attribute instead";
-  return success();
-}
-
 //===----------------------------------------------------------------------===//
 // YieldOp
 //===----------------------------------------------------------------------===//

mlir/lib/Target/Cpp/TranslateToCpp.cpp

@@ -435,8 +435,6 @@ static LogicalResult printOperation(CppEmitter &emitter,
 
   os << verbatimOp.getValue();
 
-  if (verbatimOp.getTrailingSemicolon())
-    os << ";";
   return success();
 }
 

mlir/test/Dialect/EmitC/invalid_ops.mlir

@@ -289,11 +289,3 @@ func.func @test_expression_multiple_results(%arg0: i32) -> i32 {
   }
   return %r : i32
 }
-
-// -----
-
-func.func @verbatim_trailing_semicolon() {
-    // expected-error @+1 {{'emitc.verbatim' op ';' not allowed as the last character, use the `trailing_semicolon` attribute instead}}
-    emitc.verbatim "typedef int32_t i32;"
-    return
-}

mlir/test/Dialect/EmitC/ops.mlir

@@ -175,5 +175,5 @@ emitc.verbatim "#ifdef __cplusplus"
 emitc.verbatim "}  // extern \"C\""
 emitc.verbatim "#endif  // __cplusplus"
 
-emitc.verbatim "typedef int32_t i32" {trailing_semicolon = unit}
-emitc.verbatim "typedef float f32" trailing_semicolon
+emitc.verbatim "typedef int32_t i32;"
+emitc.verbatim "typedef float f32;"

mlir/test/Target/Cpp/verbatim.mlir

@@ -15,7 +15,7 @@ emitc.verbatim "}  // extern \"C\""
 emitc.verbatim "#endif  // __cplusplus"
 // CHECK-NEXT: #endif  // __cplusplus
 
-emitc.verbatim "typedef int32_t i32" {trailing_semicolon = unit}
+emitc.verbatim "typedef int32_t i32;"
 // CHECK-NEXT: typedef int32_t i32;
-emitc.verbatim "typedef float f32" trailing_semicolon
+emitc.verbatim "typedef float f32;"
 // CHECK-NEXT: typedef float f32;