Fix failing tests

Author: banach-space

flang/lib/Frontend/CompilerInvocation.cpp

@@ -123,7 +123,7 @@ static bool ParseFrontendArgs(FrontendOptions &opts, llvm::opt::ArgList &args,
     case clang::driver::options::OPT_fsyntax_only:
       opts.programAction = ParseSyntaxOnly;
       break;
-    case clang::driver::options::OPT_emit_fir:
+    case clang::driver::options::OPT_emit_mlir:
       opts.programAction = EmitMLIR;
       break;
     case clang::driver::options::OPT_emit_obj:

flang/test/Driver/driver-help-hidden.f90

@@ -22,7 +22,7 @@
 ! CHECK-NEXT: -cpp      Enable predefined and command line preprocessor macros
 ! CHECK-NEXT: -c        Only run preprocess, compile, and assemble steps
 ! CHECK-NEXT: -D <macro>=<value>     Define <macro> to <value> (or 1 if <value> omitted)
-! CHECK-NEXT: -emit-fir              Build the parse tree, then convert to FIR and dump
+! CHECK-NEXT: -emit-mlir             Build the parse tree, then lower it to MLIR and dump
 ! CHECK-NEXT: -E        Only run the preprocessor
 ! CHECK-NEXT: -falternative-parameter-statement
 ! CHECK-NEXT: Enable the old style PARAMETER statement

flang/test/Driver/driver-help.f90

@@ -22,7 +22,7 @@
 ! HELP-NEXT: -cpp                   Enable predefined and command line preprocessor macros
 ! HELP-NEXT: -c                     Only run preprocess, compile, and assemble steps
 ! HELP-NEXT: -D <macro>=<value>     Define <macro> to <value> (or 1 if <value> omitted)
-! HELP-NEXT: -emit-fir              Build the parse tree, then convert to FIR and dump
+! HELP-NEXT: -emit-mlir             Build the parse tree, then lower it to MLIR and dump
 ! HELP-NEXT: -E                     Only run the preprocessor
 ! HELP-NEXT: -falternative-parameter-statement
 ! HELP-NEXT: Enable the old style PARAMETER statement
@@ -66,7 +66,7 @@
 ! HELP-FC1-NEXT:OPTIONS:
 ! HELP-FC1-NEXT: -cpp                   Enable predefined and command line preprocessor macros
 ! HELP-FC1-NEXT: -D <macro>=<value>     Define <macro> to <value> (or 1 if <value> omitted)
-! HELP-FC1-NEXT: -emit-fir              Build the parse tree, then convert to FIR and dump
+! HELP-FC1-NEXT: -emit-mlir             Build the parse tree, then lower it to MLIR and dump
 ! HELP-FC1-NEXT: -emit-obj Emit native object files
 ! HELP-FC1-NEXT: -E                     Only run the preprocessor
 ! HELP-FC1-NEXT: -falternative-parameter-statement

flang/test/Driver/emit-fir.f90

@@ -1,4 +1,4 @@
-! RUN: %flang_fc1 -emit-fir %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-mlir %s -o - | FileCheck %s
 
 ! CHECK: module attributes {
 ! CHECK-LABEL: func @_QQmain() {