More test changes

eugeneepshteyn · eugeneepshteyn · commit 3e3d5d489bd2 · 2025-07-15T23:03:25.000-04:00
diff --git a/flang/test/Semantics/OpenMP/declare-target03.f90 b/flang/test/Semantics/OpenMP/declare-target03.f90
@@ -16,7 +16,7 @@ program main
   !ERROR: The module name or main program name cannot be in a DECLARE TARGET directive
   !$omp declare target (mod1)
 
-  !PORTABILITY: Name 'main' declared in a main program should not have the same name as the main program [-Wbenign-name-clash]
-  !ERROR: The module name or main program name cannot be in a DECLARE TARGET directive
+  ! This is now allowed: "main" is implicitly declared symbol separate
+  ! from the main program symbol
   !$omp declare target (main)
 end
diff --git a/flang/test/Semantics/OpenMP/do12.f90 b/flang/test/Semantics/OpenMP/do12.f90
@@ -3,7 +3,7 @@
 ! 2.7.1 Do Loop constructs.
 
 !DEF: /OMP_CYCLE MainProgram
-program omp_cycle
+program OMP_CYCLE
   !$omp do  collapse(1)
   !DEF: /OMP_CYCLE/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=0,10
diff --git a/flang/test/Semantics/OpenMP/do14.f90 b/flang/test/Semantics/OpenMP/do14.f90
@@ -3,7 +3,7 @@
 ! 2.7.1 Do Loop constructs.
 
 !DEF: /OMP_CYCLE MainProgram
-program omp_cycle
+program OMP_CYCLE
   !$omp do  collapse(1)
   !DEF: /OMP_CYCLE/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=0,10
@@ -88,4 +88,4 @@ program omp_cycle
     end do foo1
   end do foo
   !$omp end do
-end program omp_cycle
+end program OMP_CYCLE
diff --git a/flang/test/Semantics/OpenMP/do17.f90 b/flang/test/Semantics/OpenMP/do17.f90
@@ -3,7 +3,7 @@
 ! 2.7.1 Do Loop constructs.
 
 !DEF: /TEST MainProgram
-program test
+program TEST
  !DEF: /TEST/i ObjectEntity INTEGER(4)
  !DEF: /TEST/j ObjectEntity INTEGER(4)
  !DEF: /TEST/k ObjectEntity INTEGER(4)
@@ -54,4 +54,4 @@ program test
   end do foo1
  end do foo
 !$omp end do
-end program test
+end program TEST
diff --git a/flang/test/Semantics/OpenMP/reduction08.f90 b/flang/test/Semantics/OpenMP/reduction08.f90
@@ -3,7 +3,7 @@
 ! 2.15.3.6 Reduction Clause Positive cases
 
 !DEF: /OMP_REDUCTION MainProgram
-program omp_reduction
+program OMP_REDUCTION
   !DEF: /OMP_REDUCTION/i ObjectEntity INTEGER(4)
   integer i
   !DEF: /OMP_REDUCTION/k ObjectEntity INTEGER(4)
@@ -60,4 +60,4 @@ program omp_reduction
   end do
   !$omp end parallel do
 
-end program omp_reduction
+end program OMP_REDUCTION
diff --git a/flang/test/Semantics/OpenMP/reduction09.f90 b/flang/test/Semantics/OpenMP/reduction09.f90
@@ -2,7 +2,7 @@
 ! OpenMP Version 4.5
 ! 2.15.3.6 Reduction Clause Positive cases.
 !DEF: /OMP_REDUCTION MainProgram
-program omp_reduction
+program OMP_REDUCTION
   !DEF: /OMP_REDUCTION/i ObjectEntity INTEGER(4)
   integer i
   !DEF: /OMP_REDUCTION/k ObjectEntity INTEGER(4)
@@ -73,4 +73,4 @@ program omp_reduction
     k = k+1
   end do
   !$omp end do
-end program omp_reduction
+end program OMP_REDUCTION
diff --git a/flang/test/Semantics/OpenMP/symbol01.f90 b/flang/test/Semantics/OpenMP/symbol01.f90
@@ -17,7 +17,7 @@ module md
  end type myty
 end module md
 !DEF: /MM MainProgram
-program mm
+program MM
  !REF: /md
  use :: md
  !DEF: /MM/c CommonBlockDetails
diff --git a/flang/test/Semantics/OpenMP/symbol05.f90 b/flang/test/Semantics/OpenMP/symbol05.f90
@@ -32,9 +32,9 @@ subroutine foo
   end subroutine foo
 end module mm
 !DEF: /TT MainProgram
-program tt
+program TT
   !REF: /mm
   use :: mm
   !DEF: /TT/foo (Subroutine) Use
   call foo
-end program tt
+end program TT
diff --git a/flang/test/Semantics/OpenMP/symbol07.f90 b/flang/test/Semantics/OpenMP/symbol07.f90
@@ -31,7 +31,7 @@ subroutine function_call_in_region
   print *, a, b
 end subroutine function_call_in_region
 !DEF: /MM MainProgram
-program mm
+program MM
   !REF: /function_call_in_region
   call function_call_in_region
-end program mm
+end program MM
diff --git a/flang/test/Semantics/OpenMP/symbol09.f90 b/flang/test/Semantics/OpenMP/symbol09.f90
@@ -31,7 +31,7 @@ subroutine function_call_in_region
   print *, a, b
 end subroutine function_call_in_region
 !DEF: /MM MainProgram
-program mm
+program MM
   !REF: /function_call_in_region
   call function_call_in_region
-end program mm
+end program MM
diff --git a/flang/test/Semantics/OpenMP/threadprivate03.f90 b/flang/test/Semantics/OpenMP/threadprivate03.f90
@@ -13,8 +13,8 @@ program main
   !ERROR: The module name or main program name cannot be in a THREADPRIVATE directive
   !$omp threadprivate(mod1)
 
-  !PORTABILITY: Name 'main' declared in a main program should not have the same name as the main program [-Wbenign-name-clash]
-  !ERROR: The module name or main program name cannot be in a THREADPRIVATE directive
+  ! This is now allowed, since "main" is implicitly declared symbol,
+  ! separate from the main program symbol.
   !$omp threadprivate(main)
 
   !ERROR: The entity with PARAMETER attribute cannot be in a THREADPRIVATE directive
diff --git a/flang/test/Semantics/long-name.f90 b/flang/test/Semantics/long-name.f90
@@ -1,6 +1,6 @@
 ! RUN: %python %S/test_errors.py %s %flang_fc1 -Werror -pedantic
 
-!PORTABILITY: aaaaaaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeeeffffffffffggg1 has length 64, which is greater than the maximum name length 63 [-Wlong-names]
+!PORTABILITY: AAAAAAAAAABBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGG1 has length 64, which is greater than the maximum name length 63 [-Wlong-names]
 program aaaaaaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeeeffffffffffggg1
 
   !PORTABILITY: aaaaaaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeeeffffffffffggg2 has length 64, which is greater than the maximum name length 63 [-Wlong-names]
diff --git a/flang/test/Semantics/pointer01.f90 b/flang/test/Semantics/pointer01.f90
@@ -7,7 +7,6 @@ subroutine msubr
 end module
 program main
   use m
-  !PORTABILITY: Name 'main' declared in a main program should not have the same name as the main program [-Wbenign-name-clash]
   pointer main
   !ERROR: Cannot change POINTER attribute on use-associated 'mobj'
   pointer mobj
diff --git a/flang/test/Semantics/procinterface01.f90 b/flang/test/Semantics/procinterface01.f90
@@ -160,7 +160,7 @@ end function logical
 end function tan
 
 !DEF: /MAIN MainProgram
-program main
+program MAIN
  !REF: /module1
  use :: module1
  !DEF: /MAIN/derived1 Use
@@ -190,4 +190,4 @@ program main
  !REF: /MAIN/instance
  !REF: /module1/derived1/p8
  if (instance%p8(1.)/="a") print *, "p8 failed"
-end program main
+end program MAIN
diff --git a/flang/test/Semantics/resolve05.f90 b/flang/test/Semantics/resolve05.f90
@@ -1,6 +1,5 @@
 ! RUN: %python %S/test_errors.py %s %flang_fc1 -pedantic
 program p
-  !PORTABILITY: Name 'p' declared in a main program should not have the same name as the main program [-Wbenign-name-clash]
   integer :: p
 end
 module m
diff --git a/flang/test/Semantics/symbol03.f90 b/flang/test/Semantics/symbol03.f90
@@ -2,7 +2,7 @@
 ! Test host association in internal subroutine of main program.
 
 !DEF: /MAIN MainProgram
-program main
+program MAIN
  !DEF: /MAIN/x ObjectEntity INTEGER(4)
  integer x
  !DEF: /MAIN/s (Subroutine) Subprogram
diff --git a/flang/test/Semantics/symbol06.f90 b/flang/test/Semantics/symbol06.f90
@@ -1,6 +1,6 @@
 ! RUN: %python %S/test_symbols.py %s %flang_fc1
 !DEF: /MAIN MainProgram
-program main
+program MAIN
  !DEF: /MAIN/t1 DerivedType
  type :: t1
   !DEF: /MAIN/t1/a1 ObjectEntity INTEGER(4)
diff --git a/flang/test/Semantics/symbol07.f90 b/flang/test/Semantics/symbol07.f90
@@ -1,6 +1,6 @@
 ! RUN: %python %S/test_symbols.py %s %flang_fc1
 !DEF: /MAIN MainProgram
-program main
+program MAIN
  implicit complex(z)
  !DEF: /MAIN/t DerivedType
  type :: t
diff --git a/flang/test/Semantics/symbol08.f90 b/flang/test/Semantics/symbol08.f90
@@ -1,6 +1,6 @@
 ! RUN: %python %S/test_symbols.py %s %flang_fc1
 !DEF: /MAIN MainProgram
-program main
+program MAIN
  !DEF: /MAIN/x POINTER ObjectEntity REAL(4)
  pointer :: x
  !REF: /MAIN/x
diff --git a/flang/test/Semantics/symbol15.f90 b/flang/test/Semantics/symbol15.f90
@@ -250,7 +250,7 @@ subroutine ext2
 subroutine ext3
 end subroutine
 !DEF: /MAIN MainProgram
-program main
+program MAIN
  !REF: /m
  use :: m
  !DEF: /MAIN/pdt1 Use
diff --git a/flang/test/Semantics/symbol16.f90 b/flang/test/Semantics/symbol16.f90
@@ -2,7 +2,7 @@
 ! Statement functions
 
 !DEF: /P1 MainProgram
-program p1
+program P1
  !DEF: /P1/f (Function, StmtFunction) Subprogram INTEGER(4)
  !DEF: /P1/i ObjectEntity INTEGER(4)
  !DEF: /P1/j ObjectEntity INTEGER(4)
diff --git a/flang/test/Semantics/symbol17.f90 b/flang/test/Semantics/symbol17.f90
@@ -2,7 +2,7 @@
 ! Forward references to derived types (non-error cases)
 
 !DEF: /MAIN MainProgram
-program main
+program MAIN
  !DEF: /MAIN/t1 DerivedType
  type :: t1
   !DEF: /MAIN/t2 DerivedType
diff --git a/flang/test/Semantics/symbol18.f90 b/flang/test/Semantics/symbol18.f90
@@ -3,7 +3,7 @@
 ! Intrinsic function in type declaration statement: type is ignored
 
 !DEF: /P1 MainProgram
-program p1
+program P1
  !DEF: /P1/cos ELEMENTAL, INTRINSIC, PURE (Function) ProcEntity INTEGER(4)
  integer cos
  !DEF: /P1/y (Implicit) ObjectEntity REAL(4)
diff --git a/flang/test/Semantics/symbol20.f90 b/flang/test/Semantics/symbol20.f90
@@ -33,7 +33,7 @@ subroutine bar
  end subroutine
 end module
 !DEF: /DEMO MainProgram
-program demo
+program DEMO
  !REF: /m
  use :: m
  !DEF: /DEMO/bar (Subroutine) Use
diff --git a/flang/test/Semantics/symbol25.f90 b/flang/test/Semantics/symbol25.f90
@@ -39,7 +39,7 @@ end subroutine inner1
  end subroutine outer
 end module m
 !DEF: /MAIN MainProgram
-program main
+program MAIN
  !REF: /m
  use :: m
  !REF: /m/specific1
diff --git a/flang/test/Semantics/symbol26.f90 b/flang/test/Semantics/symbol26.f90
@@ -9,7 +9,7 @@ module m
  namelist/a/j
 end module m
 !DEF: /MAIN MainProgram
-program main
+program MAIN
  !DEF: /MAIN/j (Implicit) ObjectEntity INTEGER(4)
  j = 1
 contains
