[Flang][Alias-analysis] Revert downstream changes (llvm#2563)

Revert downstream changes because upstream Flang adds alias tags to
local objects by default (see:
llvm#143489)

Author: DominikAdamski

clang/lib/Driver/ToolChains/Flang.cpp

@@ -531,15 +531,6 @@ void Flang::addTargetOptions(const ArgList &Args,
       CmdArgs.push_back(A->getValue());
   }
 
-  // FIXME: Remove it when local alias tags are generated by default
-  //  See: https://github.com/llvm/llvm-project/pull/139682
-  //  We need this downstream hack due to ARM failure for test case:
-  //  https://github.com/fujitsu/compiler-test-suite/blob/main/Fortran/0614/0614_0005.f
-  if (!Triple.isARM()) {
-    CmdArgs.push_back("-mmlir");
-    CmdArgs.push_back("-tbaa-local-alloc");
-  }
-
   Args.addAllArgs(CmdArgs,
                   {options::OPT_fverbose_asm, options::OPT_fno_verbose_asm});
 }

flang/lib/Optimizer/Transforms/AddAliasTags.cpp

@@ -44,7 +44,7 @@ static llvm::cl::opt<bool>
     enableDirect("direct-tbaa", llvm::cl::init(true), llvm::cl::Hidden,
                  llvm::cl::desc("Add TBAA tags to direct variables"));
 static llvm::cl::opt<bool>
-    enableLocalAllocs("tbaa-local-alloc", llvm::cl::init(true),
+    enableLocalAllocs("local-alloc-tbaa", llvm::cl::init(true),
                       llvm::cl::Hidden,
                       llvm::cl::desc("Add TBAA tags to local allocations."));
 

flang/test/Transforms/tbaa3.fir

@@ -1,5 +1,5 @@
 // RUN: fir-opt --fir-add-alias-tags %s | FileCheck --check-prefixes=ALL,DEFAULT %s
-// RUN: fir-opt --fir-add-alias-tags --tbaa-local-alloc %s | FileCheck --check-prefixes=ALL,LOCAL %s
+// RUN: fir-opt --fir-add-alias-tags --local-alloc-tbaa %s | FileCheck --check-prefixes=ALL,LOCAL %s
 
 // Test AddAliasTagsPass creating sub-tree for TARGET/POINTER variables.
 

flang/test/Transforms/tbaa4.fir

@@ -1,6 +1,6 @@
 // Test TBAA tags for common and equivalence.
 // RUN: fir-opt --fir-add-alias-tags --split-input-file %s | FileCheck --check-prefixes=ALL,DEFAULT %s
-// RUN: fir-opt --fir-add-alias-tags --tbaa-local-alloc --split-input-file %s | FileCheck --check-prefixes=ALL,LOCAL %s
+// RUN: fir-opt --fir-add-alias-tags --local-alloc-tbaa --split-input-file %s | FileCheck --check-prefixes=ALL,LOCAL %s
 
 // ALL: #[[ROOT:.+]] = #llvm.tbaa_root<id = "Flang function root _QPtest_common">
 // ALL: #[[ANY:.+]] = #llvm.tbaa_type_desc<id = "any access", members = {<#[[ROOT]], 0>}>