[llvm-branch-commits] [flang] 8e3adda - [flang][driver] Remove newline in CompilerInvocation

2021-01-25 Thread Faris Rehman via llvm-branch-commits 

Author: Faris Rehman
Date: 2021-01-25T11:58:52Z
New Revision: 8e3adda820e8cd06ca86a83c23cf6adf46b786fa

URL: 
https://github.com/llvm/llvm-project/commit/8e3adda820e8cd06ca86a83c23cf6adf46b786fa
DIFF: 
https://github.com/llvm/llvm-project/commit/8e3adda820e8cd06ca86a83c23cf6adf46b786fa.diff

LOG: [flang][driver] Remove newline in CompilerInvocation

Remove a new line in CompilerInvocation, to now follow the style when 
clang-format is applied.

Added: 


Modified: 
flang/lib/Frontend/CompilerInvocation.cpp

Removed: 




diff  --git a/flang/lib/Frontend/CompilerInvocation.cpp 
b/flang/lib/Frontend/CompilerInvocation.cpp
index cd0faf215a5a..b34b47a18b85 100644
--- a/flang/lib/Frontend/CompilerInvocation.cpp
+++ b/flang/lib/Frontend/CompilerInvocation.cpp
@@ -191,8 +191,7 @@ bool CompilerInvocation::CreateFromArgs(CompilerInvocation 
&res,
 
   // Parse the arguments
   const llvm::opt::OptTable &opts = clang::driver::getDriverOptTable();
-  const unsigned includedFlagsBitmask =
-  clang::driver::options::FC1Option;
+  const unsigned includedFlagsBitmask = clang::driver::options::FC1Option;
   unsigned missingArgIndex, missingArgCount;
   llvm::opt::InputArgList args = opts.ParseArgs(
   commandLineArgs, missingArgIndex, missingArgCount, includedFlagsBitmask);



___
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits

[llvm-branch-commits] [flang] 1c8f199 - [flang][driver] Update PP tests to use the new driver

2021-01-25 Thread Faris Rehman via llvm-branch-commits 

Author: Faris Rehman
Date: 2021-01-25T12:32:23Z
New Revision: 1c8f199f449916d30ec12ecc5bb0f157ab1d01a0

URL: 
https://github.com/llvm/llvm-project/commit/1c8f199f449916d30ec12ecc5bb0f157ab1d01a0
DIFF: 
https://github.com/llvm/llvm-project/commit/1c8f199f449916d30ec12ecc5bb0f157ab1d01a0.diff

LOG: [flang][driver] Update PP tests to use the new driver

Update the preprocessor regression tests to use the new driver if the new 
driver is built (FLANG_BUILD_NEW_DRIVER=On), otherwise the tests will still run 
using f18.

Summary of changes:
- Introduce %flang to the regression tests, which points to the new driver if 
it is built or otherwise points to f18
- Update all tests in flang/test/Preprocessing/ to use %flang

Differential Revision: https://reviews.llvm.org/D94805

Added: 


Modified: 
flang/test/Preprocessing/assert.F90
flang/test/Preprocessing/compiler_defined_macros.F90
flang/test/Preprocessing/defines.F90
flang/test/Preprocessing/fixed-rescan.F
flang/test/Preprocessing/hollerith.f
flang/test/Preprocessing/include-comment.F90
flang/test/Preprocessing/pp001.F
flang/test/Preprocessing/pp002.F
flang/test/Preprocessing/pp003.F
flang/test/Preprocessing/pp004.F
flang/test/Preprocessing/pp005.F
flang/test/Preprocessing/pp006.F
flang/test/Preprocessing/pp007.F
flang/test/Preprocessing/pp008.F
flang/test/Preprocessing/pp009.F
flang/test/Preprocessing/pp010.F
flang/test/Preprocessing/pp011.F
flang/test/Preprocessing/pp012.F
flang/test/Preprocessing/pp013.F
flang/test/Preprocessing/pp014.F
flang/test/Preprocessing/pp015.F
flang/test/Preprocessing/pp016.F
flang/test/Preprocessing/pp017.F
flang/test/Preprocessing/pp018.F
flang/test/Preprocessing/pp019.F
flang/test/Preprocessing/pp020.F
flang/test/Preprocessing/pp021.F
flang/test/Preprocessing/pp022.F
flang/test/Preprocessing/pp023.F
flang/test/Preprocessing/pp024.F
flang/test/Preprocessing/pp025.F
flang/test/Preprocessing/pp026.F
flang/test/Preprocessing/pp027.F
flang/test/Preprocessing/pp028.F
flang/test/Preprocessing/pp029.F
flang/test/Preprocessing/pp030.F
flang/test/Preprocessing/pp031.F
flang/test/Preprocessing/pp032.F
flang/test/Preprocessing/pp033.F
flang/test/Preprocessing/pp034.F
flang/test/Preprocessing/pp035.F
flang/test/Preprocessing/pp036.F
flang/test/Preprocessing/pp037.F
flang/test/Preprocessing/pp038.F
flang/test/Preprocessing/pp039.F
flang/test/Preprocessing/pp040.F
flang/test/Preprocessing/pp041.F
flang/test/Preprocessing/pp042.F
flang/test/Preprocessing/pp043.F
flang/test/Preprocessing/pp044.F
flang/test/Preprocessing/pp101.F90
flang/test/Preprocessing/pp102.F90
flang/test/Preprocessing/pp103.F90
flang/test/Preprocessing/pp104.F90
flang/test/Preprocessing/pp105.F90
flang/test/Preprocessing/pp106.F90
flang/test/Preprocessing/pp107.F90
flang/test/Preprocessing/pp108.F90
flang/test/Preprocessing/pp109.F90
flang/test/Preprocessing/pp110.F90
flang/test/Preprocessing/pp111.F90
flang/test/Preprocessing/pp112.F90
flang/test/Preprocessing/pp113.F90
flang/test/Preprocessing/pp114.F90
flang/test/Preprocessing/pp115.F90
flang/test/Preprocessing/pp116.F90
flang/test/Preprocessing/pp117.F90
flang/test/Preprocessing/pp118.F90
flang/test/Preprocessing/pp119.F90
flang/test/Preprocessing/pp120.F90
flang/test/Preprocessing/pp121.F90
flang/test/Preprocessing/pp122.F90
flang/test/Preprocessing/pp123.F90
flang/test/Preprocessing/pp124.F90
flang/test/Preprocessing/pp125.F90
flang/test/Preprocessing/pp126.F90
flang/test/Preprocessing/pp127.F90
flang/test/Preprocessing/pp128.F90
flang/test/Preprocessing/pp129.F90
flang/test/Preprocessing/pp130.F90
flang/test/lit.cfg.py

Removed: 




diff  --git a/flang/test/Preprocessing/assert.F90 
b/flang/test/Preprocessing/assert.F90
index 64d49e6f1cbd..5d4837efd6d5 100644
--- a/flang/test/Preprocessing/assert.F90
+++ b/flang/test/Preprocessing/assert.F90
@@ -1,4 +1,4 @@
-!RUN: %f18 -E %s 2>&1 | FileCheck %s
+!RUN: %flang -E %s 2>&1 | FileCheck %s
 !CHECK: if(.not.(.true.)) error stop "assert(" // ".TRUE." // ") failed " // 
"at ""
 !CHECK-SAME: assert.F90"": " // "7"
 #define STR(x) #x

diff  --git a/flang/test/Preprocessing/compiler_defined_macros.F90 
b/flang/test/Preprocessing/compiler_defined_macros.F90
index ba20f6d39622..f5f955bbc750 100644
--- a/flang/test/Preprocessing/compiler_defined_macros.F90
+++ b/flang/test/Preprocessing/compiler_defined_macros.F90
@@ -3,7 +3,7 @@
 !CHECK: flang_major = {{[1-9][0-9]*$}}
 !CHECK: flang_minor = {{[0-9]+$}}
 !CHECK: flang_patchlevel = {{[0-9]+$}}
-!RUN: %f18 -E %s | FileCheck  --ignore-case %s
+!RUN: %flang -E %s | FileCheck  --ignore-case %s
 
   
 integer, parameter :: flang_major