Index: flang/lib/Evaluate/intrinsics.cpp
===================================================================
--- flang/lib/Evaluate/intrinsics.cpp
+++ flang/lib/Evaluate/intrinsics.cpp
@@ -922,22 +922,22 @@
          TypePattern{IntType, KindCode::exactKind, 1}},
         "abs"},
     {{"cabs", {{"a", DefaultComplex}}, DefaultReal}, "abs"},
-    {{"ccos", {{"a", DefaultComplex}}, DefaultComplex}, "cos"},
+    {{"ccos", {{"x", DefaultComplex}}, DefaultComplex}, "cos"},
     {{"cdabs", {{"a", DoublePrecisionComplex}}, DoublePrecision}, "abs"},
-    {{"cdcos", {{"a", DoublePrecisionComplex}}, DoublePrecisionComplex}, "cos"},
-    {{"cdexp", {{"a", DoublePrecisionComplex}}, DoublePrecisionComplex}, "exp"},
-    {{"cdlog", {{"a", DoublePrecisionComplex}}, DoublePrecisionComplex}, "log"},
-    {{"cdsin", {{"a", DoublePrecisionComplex}}, DoublePrecisionComplex}, "sin"},
-    {{"cdsqrt", {{"a", DoublePrecisionComplex}}, DoublePrecisionComplex},
+    {{"cdcos", {{"x", DoublePrecisionComplex}}, DoublePrecisionComplex}, "cos"},
+    {{"cdexp", {{"x", DoublePrecisionComplex}}, DoublePrecisionComplex}, "exp"},
+    {{"cdlog", {{"x", DoublePrecisionComplex}}, DoublePrecisionComplex}, "log"},
+    {{"cdsin", {{"x", DoublePrecisionComplex}}, DoublePrecisionComplex}, "sin"},
+    {{"cdsqrt", {{"x", DoublePrecisionComplex}}, DoublePrecisionComplex},
         "sqrt"},
-    {{"cexp", {{"a", DefaultComplex}}, DefaultComplex}, "exp"},
-    {{"clog", {{"a", DefaultComplex}}, DefaultComplex}, "log"},
-    {{"conjg", {{"a", DefaultComplex}}, DefaultComplex}},
+    {{"cexp", {{"x", DefaultComplex}}, DefaultComplex}, "exp"},
+    {{"clog", {{"x", DefaultComplex}}, DefaultComplex}, "log"},
+    {{"conjg", {{"z", DefaultComplex}}, DefaultComplex}},
     {{"cos", {{"x", DefaultReal}}, DefaultReal}},
     {{"cosh", {{"x", DefaultReal}}, DefaultReal}},
-    {{"csin", {{"a", DefaultComplex}}, DefaultComplex}, "sin"},
-    {{"csqrt", {{"a", DefaultComplex}}, DefaultComplex}, "sqrt"},
-    {{"ctan", {{"a", DefaultComplex}}, DefaultComplex}, "tan"},
+    {{"csin", {{"x", DefaultComplex}}, DefaultComplex}, "sin"},
+    {{"csqrt", {{"x", DefaultComplex}}, DefaultComplex}, "sqrt"},
+    {{"ctan", {{"x", DefaultComplex}}, DefaultComplex}, "tan"},
     {{"dabs", {{"a", DoublePrecision}}, DoublePrecision}, "abs"},
     {{"dacos", {{"x", DoublePrecision}}, DoublePrecision}, "acos"},
     {{"dasin", {{"x", DoublePrecision}}, DoublePrecision}, "asin"},
@@ -951,16 +951,16 @@
              {"y", AnyIntOrReal, Rank::elementalOrBOZ, Optionality::optional}},
          DoublePrecisionComplex},
         "cmplx", true},
-    {{"dconjg", {{"a", AnyComplex}}, DoublePrecisionComplex}, "conjg"},
+    {{"dconjg", {{"z", AnyComplex}}, DoublePrecisionComplex}, "conjg"},
     {{"dcos", {{"x", DoublePrecision}}, DoublePrecision}, "cos"},
     {{"dcosh", {{"x", DoublePrecision}}, DoublePrecision}, "cosh"},
     {{"ddim", {{"x", DoublePrecision}, {"y", DoublePrecision}},
          DoublePrecision},
         "dim"},
     {{"dexp", {{"x", DoublePrecision}}, DoublePrecision}, "exp"},
-    {{"dfloat", {{"i", AnyInt}}, DoublePrecision}, "real", true},
+    {{"dfloat", {{"a", AnyInt}}, DoublePrecision}, "real", true},
     {{"dim", {{"x", DefaultReal}, {"y", DefaultReal}}, DefaultReal}},
-    {{"dimag", {{"a", AnyComplex}}, DoublePrecision}, "aimag"},
+    {{"dimag", {{"z", AnyComplex}}, DoublePrecision}, "aimag"},
     {{"dint", {{"a", DoublePrecision}}, DoublePrecision}, "aint"},
     {{"dlog", {{"x", DoublePrecision}}, DoublePrecision}, "log"},
     {{"dlog10", {{"x", DoublePrecision}}, DoublePrecision}, "log10"},
@@ -989,7 +989,7 @@
     {{"dtan", {{"x", DoublePrecision}}, DoublePrecision}, "tan"},
     {{"dtanh", {{"x", DoublePrecision}}, DoublePrecision}, "tanh"},
     {{"exp", {{"x", DefaultReal}}, DefaultReal}},
-    {{"float", {{"i", AnyInt}}, DefaultReal}, "real", true},
+    {{"float", {{"a", AnyInt}}, DefaultReal}, "real", true},
     {{"iabs", {{"a", DefaultInt}}, DefaultInt}, "abs"},
     {{"idim", {{"x", DefaultInt}, {"y", DefaultInt}}, DefaultInt}, "dim"},
     {{"idint", {{"a", AnyReal}}, DefaultInt}, "int", true},