diff --git a/mlir/test/lib/Dialect/Test/TestTypeDefs.td b/mlir/test/lib/Dialect/Test/TestTypeDefs.td
--- a/mlir/test/lib/Dialect/Test/TestTypeDefs.td
+++ b/mlir/test/lib/Dialect/Test/TestTypeDefs.td
@@ -18,7 +18,7 @@
     let mnemonic = "smpla";
 
     let printer = [{ $_printer << "smpla"; }];
-    let parser = [{ return get(ctxt); }];
+    let parser = [{ return get($_ctxt); }];
 }
 
 // A more complex parameterized type
@@ -62,7 +62,7 @@
     int width;
     if ($_parser.parseInteger(width)) return Type();
     if ($_parser.parseGreater()) return Type();
-    return get(ctxt, signedness, width);   
+    return get(ctxt, signedness, width);
   }];
 
   let extraClassDeclaration = [{
diff --git a/mlir/test/mlir-tblgen/testdialect-typedefs.mlir b/mlir/test/mlir-tblgen/testdialect-typedefs.mlir
--- a/mlir/test/mlir-tblgen/testdialect-typedefs.mlir
+++ b/mlir/test/mlir-tblgen/testdialect-typedefs.mlir
@@ -20,5 +20,5 @@
 
 // CHECK: @structTest(%arg0: !test.struct<{field1,!test.smpla},{field2,!test.int<unsigned, 3>}>)
 func @structTest (%A : !test.struct< {field1, !test.smpla}, {field2, !test.int<none, 3>} > ) {
-  return 
+  return
 }
diff --git a/mlir/test/mlir-tblgen/typedefs.td b/mlir/test/mlir-tblgen/typedefs.td
--- a/mlir/test/mlir-tblgen/typedefs.td
+++ b/mlir/test/mlir-tblgen/typedefs.td
@@ -89,7 +89,7 @@
     let genVerifyInvariantsDecl = 1;
     let parameters = (
         ins
-        "SignednessSemantics":$signedness, 
+        "SignednessSemantics":$signedness,
         TypeParameter<"unsigned", "Bitwdith of integer">:$width
     );