[flang-commits] [flang] [flang][OpenMP] Implement checks for rectangular loops (PR #190648)

Tue Apr 7 06:47:25 PDT 2026

github-actions[bot] wrote:

<!--PREMERGE ADVISOR COMMENT: Windows-->
# :window: Windows x64 Test Results

The build failed before running any tests. Click on a failure below to see the details.

<details>
<summary>[code=1] tools/flang/lib/Semantics/CMakeFiles/FortranSemantics.dir/check-omp-atomic.cpp.obj</summary>

```
FAILED: [code=1] tools/flang/lib/Semantics/CMakeFiles/FortranSemantics.dir/check-omp-atomic.cpp.obj
sccache C:\clang\clang-msvc\bin\clang-cl.exe  /nologo -TP -DFLANG_INCLUDE_TESTS=1 -DUNICODE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_GLIBCXX_ASSERTIONS -D_HAS_EXCEPTIONS=0 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -IC:\_work\llvm-project\llvm-project\build\tools\flang\lib\Semantics -IC:\_work\llvm-project\llvm-project\flang\lib\Semantics -IC:\_work\llvm-project\llvm-project\flang\include -IC:\_work\llvm-project\llvm-project\build\tools\flang\include -IC:\_work\llvm-project\llvm-project\build\include -IC:\_work\llvm-project\llvm-project\llvm\include -imsvcC:\_work\llvm-project\llvm-project\flang\..\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\clang\include -imsvcC:\_work\llvm-project\llvm-project\llvm\..\clang\include /DWIN32 /D_WINDOWS   /Zc:inline /Zc:__cplusplus /Oi /Brepro /bigobj /permissive- -Werror=unguarded-availability-new /W4  -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wno-pass-failed -Wmisleading-indentation -Wctad-maybe-unsupported /Gw -Wno-deprecated-copy -Wno-string-conversion -Wno-ctad-maybe-unsupported /O2 /Ob2  -std:c++17 -MD -UNDEBUG /EHs-c- /GR- /showIncludes /Fotools\flang\lib\Semantics\CMakeFiles\FortranSemantics.dir\check-omp-atomic.cpp.obj /Fdtools\flang\lib\Semantics\CMakeFiles\FortranSemantics.dir\FortranSemantics.pdb -c -- C:\_work\llvm-project\llvm-project\flang\lib\Semantics\check-omp-atomic.cpp
In file included from C:\_work\llvm-project\llvm-project\flang\lib\Semantics\check-omp-atomic.cpp:24:
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(58,1): error: version control conflict marker in file
58 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(199,1): error: version control conflict marker in file
199 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(257,1): error: version control conflict marker in file
257 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
3 errors generated.
```
</details>
<details>
<summary>[code=1] tools/flang/lib/Semantics/CMakeFiles/FortranSemantics.dir/check-omp-loop.cpp.obj</summary>

```
FAILED: [code=1] tools/flang/lib/Semantics/CMakeFiles/FortranSemantics.dir/check-omp-loop.cpp.obj
sccache C:\clang\clang-msvc\bin\clang-cl.exe  /nologo -TP -DFLANG_INCLUDE_TESTS=1 -DUNICODE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_GLIBCXX_ASSERTIONS -D_HAS_EXCEPTIONS=0 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -IC:\_work\llvm-project\llvm-project\build\tools\flang\lib\Semantics -IC:\_work\llvm-project\llvm-project\flang\lib\Semantics -IC:\_work\llvm-project\llvm-project\flang\include -IC:\_work\llvm-project\llvm-project\build\tools\flang\include -IC:\_work\llvm-project\llvm-project\build\include -IC:\_work\llvm-project\llvm-project\llvm\include -imsvcC:\_work\llvm-project\llvm-project\flang\..\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\clang\include -imsvcC:\_work\llvm-project\llvm-project\llvm\..\clang\include /DWIN32 /D_WINDOWS   /Zc:inline /Zc:__cplusplus /Oi /Brepro /bigobj /permissive- -Werror=unguarded-availability-new /W4  -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wno-pass-failed -Wmisleading-indentation -Wctad-maybe-unsupported /Gw -Wno-deprecated-copy -Wno-string-conversion -Wno-ctad-maybe-unsupported /O2 /Ob2  -std:c++17 -MD -UNDEBUG /EHs-c- /GR- /showIncludes /Fotools\flang\lib\Semantics\CMakeFiles\FortranSemantics.dir\check-omp-loop.cpp.obj /Fdtools\flang\lib\Semantics\CMakeFiles\FortranSemantics.dir\FortranSemantics.pdb -c -- C:\_work\llvm-project\llvm-project\flang\lib\Semantics\check-omp-loop.cpp
In file included from C:\_work\llvm-project\llvm-project\flang\lib\Semantics\check-omp-loop.cpp:25:
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(58,1): error: version control conflict marker in file
58 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(199,1): error: version control conflict marker in file
199 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(257,1): error: version control conflict marker in file
257 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
3 errors generated.
```
</details>
<details>
<summary>[code=1] tools/flang/lib/Semantics/CMakeFiles/FortranSemantics.dir/check-omp-metadirective.cpp.obj</summary>

```
FAILED: [code=1] tools/flang/lib/Semantics/CMakeFiles/FortranSemantics.dir/check-omp-metadirective.cpp.obj
sccache C:\clang\clang-msvc\bin\clang-cl.exe  /nologo -TP -DFLANG_INCLUDE_TESTS=1 -DUNICODE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_GLIBCXX_ASSERTIONS -D_HAS_EXCEPTIONS=0 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -IC:\_work\llvm-project\llvm-project\build\tools\flang\lib\Semantics -IC:\_work\llvm-project\llvm-project\flang\lib\Semantics -IC:\_work\llvm-project\llvm-project\flang\include -IC:\_work\llvm-project\llvm-project\build\tools\flang\include -IC:\_work\llvm-project\llvm-project\build\include -IC:\_work\llvm-project\llvm-project\llvm\include -imsvcC:\_work\llvm-project\llvm-project\flang\..\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\clang\include -imsvcC:\_work\llvm-project\llvm-project\llvm\..\clang\include /DWIN32 /D_WINDOWS   /Zc:inline /Zc:__cplusplus /Oi /Brepro /bigobj /permissive- -Werror=unguarded-availability-new /W4  -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wno-pass-failed -Wmisleading-indentation -Wctad-maybe-unsupported /Gw -Wno-deprecated-copy -Wno-string-conversion -Wno-ctad-maybe-unsupported /O2 /Ob2  -std:c++17 -MD -UNDEBUG /EHs-c- /GR- /showIncludes /Fotools\flang\lib\Semantics\CMakeFiles\FortranSemantics.dir\check-omp-metadirective.cpp.obj /Fdtools\flang\lib\Semantics\CMakeFiles\FortranSemantics.dir\FortranSemantics.pdb -c -- C:\_work\llvm-project\llvm-project\flang\lib\Semantics\check-omp-metadirective.cpp
In file included from C:\_work\llvm-project\llvm-project\flang\lib\Semantics\check-omp-metadirective.cpp:22:
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(58,1): error: version control conflict marker in file
58 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(199,1): error: version control conflict marker in file
199 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(257,1): error: version control conflict marker in file
257 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
3 errors generated.
```
</details>
<details>
<summary>[code=1] tools/flang/lib/Semantics/CMakeFiles/FortranSemantics.dir/check-omp-structure.cpp.obj</summary>

```
FAILED: [code=1] tools/flang/lib/Semantics/CMakeFiles/FortranSemantics.dir/check-omp-structure.cpp.obj
sccache C:\clang\clang-msvc\bin\clang-cl.exe  /nologo -TP -DFLANG_INCLUDE_TESTS=1 -DUNICODE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_GLIBCXX_ASSERTIONS -D_HAS_EXCEPTIONS=0 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -IC:\_work\llvm-project\llvm-project\build\tools\flang\lib\Semantics -IC:\_work\llvm-project\llvm-project\flang\lib\Semantics -IC:\_work\llvm-project\llvm-project\flang\include -IC:\_work\llvm-project\llvm-project\build\tools\flang\include -IC:\_work\llvm-project\llvm-project\build\include -IC:\_work\llvm-project\llvm-project\llvm\include -imsvcC:\_work\llvm-project\llvm-project\flang\..\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\clang\include -imsvcC:\_work\llvm-project\llvm-project\llvm\..\clang\include /DWIN32 /D_WINDOWS   /Zc:inline /Zc:__cplusplus /Oi /Brepro /bigobj /permissive- -Werror=unguarded-availability-new /W4  -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wno-pass-failed -Wmisleading-indentation -Wctad-maybe-unsupported /Gw -Wno-deprecated-copy -Wno-string-conversion -Wno-ctad-maybe-unsupported /O2 /Ob2  -std:c++17 -MD -UNDEBUG /EHs-c- /GR- /showIncludes /Fotools\flang\lib\Semantics\CMakeFiles\FortranSemantics.dir\check-omp-structure.cpp.obj /Fdtools\flang\lib\Semantics\CMakeFiles\FortranSemantics.dir\FortranSemantics.pdb -c -- C:\_work\llvm-project\llvm-project\flang\lib\Semantics\check-omp-structure.cpp
In file included from C:\_work\llvm-project\llvm-project\flang\lib\Semantics\check-omp-structure.cpp:31:
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(58,1): error: version control conflict marker in file
58 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(199,1): error: version control conflict marker in file
199 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(257,1): error: version control conflict marker in file
257 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
3 errors generated.
```
</details>
<details>
<summary>[code=1] tools/flang/lib/Semantics/CMakeFiles/FortranSemantics.dir/openmp-utils.cpp.obj</summary>

```
FAILED: [code=1] tools/flang/lib/Semantics/CMakeFiles/FortranSemantics.dir/openmp-utils.cpp.obj
sccache C:\clang\clang-msvc\bin\clang-cl.exe  /nologo -TP -DFLANG_INCLUDE_TESTS=1 -DUNICODE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_GLIBCXX_ASSERTIONS -D_HAS_EXCEPTIONS=0 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -IC:\_work\llvm-project\llvm-project\build\tools\flang\lib\Semantics -IC:\_work\llvm-project\llvm-project\flang\lib\Semantics -IC:\_work\llvm-project\llvm-project\flang\include -IC:\_work\llvm-project\llvm-project\build\tools\flang\include -IC:\_work\llvm-project\llvm-project\build\include -IC:\_work\llvm-project\llvm-project\llvm\include -imsvcC:\_work\llvm-project\llvm-project\flang\..\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\clang\include -imsvcC:\_work\llvm-project\llvm-project\llvm\..\clang\include /DWIN32 /D_WINDOWS   /Zc:inline /Zc:__cplusplus /Oi /Brepro /bigobj /permissive- -Werror=unguarded-availability-new /W4  -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wno-pass-failed -Wmisleading-indentation -Wctad-maybe-unsupported /Gw -Wno-deprecated-copy -Wno-string-conversion -Wno-ctad-maybe-unsupported /O2 /Ob2  -std:c++17 -MD -UNDEBUG /EHs-c- /GR- /showIncludes /Fotools\flang\lib\Semantics\CMakeFiles\FortranSemantics.dir\openmp-utils.cpp.obj /Fdtools\flang\lib\Semantics\CMakeFiles\FortranSemantics.dir\FortranSemantics.pdb -c -- C:\_work\llvm-project\llvm-project\flang\lib\Semantics\openmp-utils.cpp
In file included from C:\_work\llvm-project\llvm-project\flang\lib\Semantics\openmp-utils.cpp:13:
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(58,1): error: version control conflict marker in file
58 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(199,1): error: version control conflict marker in file
199 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(257,1): error: version control conflict marker in file
257 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\lib\Semantics\openmp-utils.cpp(972,1): error: version control conflict marker in file
972 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
4 errors generated.
```
</details>
<details>
<summary>[code=1] tools/flang/lib/Semantics/CMakeFiles/FortranSemantics.dir/resolve-directives.cpp.obj</summary>

```
FAILED: [code=1] tools/flang/lib/Semantics/CMakeFiles/FortranSemantics.dir/resolve-directives.cpp.obj
sccache C:\clang\clang-msvc\bin\clang-cl.exe  /nologo -TP -DFLANG_INCLUDE_TESTS=1 -DUNICODE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_GLIBCXX_ASSERTIONS -D_HAS_EXCEPTIONS=0 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -IC:\_work\llvm-project\llvm-project\build\tools\flang\lib\Semantics -IC:\_work\llvm-project\llvm-project\flang\lib\Semantics -IC:\_work\llvm-project\llvm-project\flang\include -IC:\_work\llvm-project\llvm-project\build\tools\flang\include -IC:\_work\llvm-project\llvm-project\build\include -IC:\_work\llvm-project\llvm-project\llvm\include -imsvcC:\_work\llvm-project\llvm-project\flang\..\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\clang\include -imsvcC:\_work\llvm-project\llvm-project\llvm\..\clang\include /DWIN32 /D_WINDOWS   /Zc:inline /Zc:__cplusplus /Oi /Brepro /bigobj /permissive- -Werror=unguarded-availability-new /W4  -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wno-pass-failed -Wmisleading-indentation -Wctad-maybe-unsupported /Gw -Wno-deprecated-copy -Wno-string-conversion -Wno-ctad-maybe-unsupported /O2 /Ob2  -std:c++17 -MD -UNDEBUG /EHs-c- /GR- /showIncludes /Fotools\flang\lib\Semantics\CMakeFiles\FortranSemantics.dir\resolve-directives.cpp.obj /Fdtools\flang\lib\Semantics\CMakeFiles\FortranSemantics.dir\FortranSemantics.pdb -c -- C:\_work\llvm-project\llvm-project\flang\lib\Semantics\resolve-directives.cpp
In file included from C:\_work\llvm-project\llvm-project\flang\lib\Semantics\resolve-directives.cpp:25:
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(58,1): error: version control conflict marker in file
58 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(199,1): error: version control conflict marker in file
199 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(257,1): error: version control conflict marker in file
257 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
3 errors generated.
```
</details>
<details>
<summary>[code=1] tools/flang/lib/Semantics/CMakeFiles/FortranSemantics.dir/resolve-names.cpp.obj</summary>

```
FAILED: [code=1] tools/flang/lib/Semantics/CMakeFiles/FortranSemantics.dir/resolve-names.cpp.obj
sccache C:\clang\clang-msvc\bin\clang-cl.exe  /nologo -TP -DFLANG_INCLUDE_TESTS=1 -DUNICODE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_GLIBCXX_ASSERTIONS -D_HAS_EXCEPTIONS=0 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -IC:\_work\llvm-project\llvm-project\build\tools\flang\lib\Semantics -IC:\_work\llvm-project\llvm-project\flang\lib\Semantics -IC:\_work\llvm-project\llvm-project\flang\include -IC:\_work\llvm-project\llvm-project\build\tools\flang\include -IC:\_work\llvm-project\llvm-project\build\include -IC:\_work\llvm-project\llvm-project\llvm\include -imsvcC:\_work\llvm-project\llvm-project\flang\..\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\clang\include -imsvcC:\_work\llvm-project\llvm-project\llvm\..\clang\include /DWIN32 /D_WINDOWS   /Zc:inline /Zc:__cplusplus /Oi /Brepro /bigobj /permissive- -Werror=unguarded-availability-new /W4  -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wno-pass-failed -Wmisleading-indentation -Wctad-maybe-unsupported /Gw -Wno-deprecated-copy -Wno-string-conversion -Wno-ctad-maybe-unsupported /O2 /Ob2  -std:c++17 -MD -UNDEBUG /EHs-c- /GR- /showIncludes /Fotools\flang\lib\Semantics\CMakeFiles\FortranSemantics.dir\resolve-names.cpp.obj /Fdtools\flang\lib\Semantics\CMakeFiles\FortranSemantics.dir\FortranSemantics.pdb -c -- C:\_work\llvm-project\llvm-project\flang\lib\Semantics\resolve-names.cpp
In file included from C:\_work\llvm-project\llvm-project\flang\lib\Semantics\resolve-names.cpp:36:
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(58,1): error: version control conflict marker in file
58 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(199,1): error: version control conflict marker in file
199 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(257,1): error: version control conflict marker in file
257 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
3 errors generated.
```
</details>
<details>
<summary>[code=1] tools/flang/lib/Lower/CMakeFiles/FortranLower.dir/OpenMP/Clauses.cpp.obj</summary>

```
FAILED: [code=1] tools/flang/lib/Lower/CMakeFiles/FortranLower.dir/OpenMP/Clauses.cpp.obj
sccache C:\clang\clang-msvc\bin\clang-cl.exe  /nologo -TP -DFLANG_INCLUDE_TESTS=1 -DUNICODE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_GLIBCXX_ASSERTIONS -D_HAS_EXCEPTIONS=0 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -IC:\_work\llvm-project\llvm-project\build\tools\flang\lib\Lower -IC:\_work\llvm-project\llvm-project\flang\lib\Lower -IC:\_work\llvm-project\llvm-project\flang\include -IC:\_work\llvm-project\llvm-project\build\tools\flang\include -IC:\_work\llvm-project\llvm-project\build\include -IC:\_work\llvm-project\llvm-project\llvm\include -imsvcC:\_work\llvm-project\llvm-project\flang\..\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\clang\include -imsvcC:\_work\llvm-project\llvm-project\llvm\..\clang\include /DWIN32 /D_WINDOWS   /Zc:inline /Zc:__cplusplus /Oi /Brepro /bigobj /permissive- -Werror=unguarded-availability-new /W4  -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wno-pass-failed -Wmisleading-indentation -Wctad-maybe-unsupported /Gw -Wno-deprecated-copy -Wno-string-conversion -Wno-ctad-maybe-unsupported /O2 /Ob2  -std:c++17 -MD -UNDEBUG /EHs-c- /GR- /showIncludes /Fotools\flang\lib\Lower\CMakeFiles\FortranLower.dir\OpenMP\Clauses.cpp.obj /Fdtools\flang\lib\Lower\CMakeFiles\FortranLower.dir\FortranLower.pdb -c -- C:\_work\llvm-project\llvm-project\flang\lib\Lower\OpenMP\Clauses.cpp
In file included from C:\_work\llvm-project\llvm-project\flang\lib\Lower\OpenMP\Clauses.cpp:16:
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(58,1): error: version control conflict marker in file
58 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(199,1): error: version control conflict marker in file
199 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(257,1): error: version control conflict marker in file
257 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
3 errors generated.
```
</details>
<details>
<summary>[code=1] tools/flang/lib/Lower/CMakeFiles/FortranLower.dir/OpenMP/Atomic.cpp.obj</summary>

```
FAILED: [code=1] tools/flang/lib/Lower/CMakeFiles/FortranLower.dir/OpenMP/Atomic.cpp.obj
sccache C:\clang\clang-msvc\bin\clang-cl.exe  /nologo -TP -DFLANG_INCLUDE_TESTS=1 -DUNICODE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_GLIBCXX_ASSERTIONS -D_HAS_EXCEPTIONS=0 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -IC:\_work\llvm-project\llvm-project\build\tools\flang\lib\Lower -IC:\_work\llvm-project\llvm-project\flang\lib\Lower -IC:\_work\llvm-project\llvm-project\flang\include -IC:\_work\llvm-project\llvm-project\build\tools\flang\include -IC:\_work\llvm-project\llvm-project\build\include -IC:\_work\llvm-project\llvm-project\llvm\include -imsvcC:\_work\llvm-project\llvm-project\flang\..\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\clang\include -imsvcC:\_work\llvm-project\llvm-project\llvm\..\clang\include /DWIN32 /D_WINDOWS   /Zc:inline /Zc:__cplusplus /Oi /Brepro /bigobj /permissive- -Werror=unguarded-availability-new /W4  -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wno-pass-failed -Wmisleading-indentation -Wctad-maybe-unsupported /Gw -Wno-deprecated-copy -Wno-string-conversion -Wno-ctad-maybe-unsupported /O2 /Ob2  -std:c++17 -MD -UNDEBUG /EHs-c- /GR- /showIncludes /Fotools\flang\lib\Lower\CMakeFiles\FortranLower.dir\OpenMP\Atomic.cpp.obj /Fdtools\flang\lib\Lower\CMakeFiles\FortranLower.dir\FortranLower.pdb -c -- C:\_work\llvm-project\llvm-project\flang\lib\Lower\OpenMP\Atomic.cpp
In file included from C:\_work\llvm-project\llvm-project\flang\lib\Lower\OpenMP\Atomic.cpp:23:
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(58,1): error: version control conflict marker in file
58 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(199,1): error: version control conflict marker in file
199 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(257,1): error: version control conflict marker in file
257 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
3 errors generated.
```
</details>
<details>
<summary>[code=1] tools/flang/lib/Lower/CMakeFiles/FortranLower.dir/OpenMP/DataSharingProcessor.cpp.obj</summary>

```
FAILED: [code=1] tools/flang/lib/Lower/CMakeFiles/FortranLower.dir/OpenMP/DataSharingProcessor.cpp.obj
sccache C:\clang\clang-msvc\bin\clang-cl.exe  /nologo -TP -DFLANG_INCLUDE_TESTS=1 -DUNICODE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_GLIBCXX_ASSERTIONS -D_HAS_EXCEPTIONS=0 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -IC:\_work\llvm-project\llvm-project\build\tools\flang\lib\Lower -IC:\_work\llvm-project\llvm-project\flang\lib\Lower -IC:\_work\llvm-project\llvm-project\flang\include -IC:\_work\llvm-project\llvm-project\build\tools\flang\include -IC:\_work\llvm-project\llvm-project\build\include -IC:\_work\llvm-project\llvm-project\llvm\include -imsvcC:\_work\llvm-project\llvm-project\flang\..\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\clang\include -imsvcC:\_work\llvm-project\llvm-project\llvm\..\clang\include /DWIN32 /D_WINDOWS   /Zc:inline /Zc:__cplusplus /Oi /Brepro /bigobj /permissive- -Werror=unguarded-availability-new /W4  -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wno-pass-failed -Wmisleading-indentation -Wctad-maybe-unsupported /Gw -Wno-deprecated-copy -Wno-string-conversion -Wno-ctad-maybe-unsupported /O2 /Ob2  -std:c++17 -MD -UNDEBUG /EHs-c- /GR- /showIncludes /Fotools\flang\lib\Lower\CMakeFiles\FortranLower.dir\OpenMP\DataSharingProcessor.cpp.obj /Fdtools\flang\lib\Lower\CMakeFiles\FortranLower.dir\FortranLower.pdb -c -- C:\_work\llvm-project\llvm-project\flang\lib\Lower\OpenMP\DataSharingProcessor.cpp
In file included from C:\_work\llvm-project\llvm-project\flang\lib\Lower\OpenMP\DataSharingProcessor.cpp:30:
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(58,1): error: version control conflict marker in file
58 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(199,1): error: version control conflict marker in file
199 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(257,1): error: version control conflict marker in file
257 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
3 errors generated.
```
</details>
<details>
<summary>[code=1] tools/flang/lib/Lower/CMakeFiles/FortranLower.dir/OpenMP/OpenMP.cpp.obj</summary>

```
FAILED: [code=1] tools/flang/lib/Lower/CMakeFiles/FortranLower.dir/OpenMP/OpenMP.cpp.obj
sccache C:\clang\clang-msvc\bin\clang-cl.exe  /nologo -TP -DFLANG_INCLUDE_TESTS=1 -DUNICODE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_GLIBCXX_ASSERTIONS -D_HAS_EXCEPTIONS=0 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -IC:\_work\llvm-project\llvm-project\build\tools\flang\lib\Lower -IC:\_work\llvm-project\llvm-project\flang\lib\Lower -IC:\_work\llvm-project\llvm-project\flang\include -IC:\_work\llvm-project\llvm-project\build\tools\flang\include -IC:\_work\llvm-project\llvm-project\build\include -IC:\_work\llvm-project\llvm-project\llvm\include -imsvcC:\_work\llvm-project\llvm-project\flang\..\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\clang\include -imsvcC:\_work\llvm-project\llvm-project\llvm\..\clang\include /DWIN32 /D_WINDOWS   /Zc:inline /Zc:__cplusplus /Oi /Brepro /bigobj /permissive- -Werror=unguarded-availability-new /W4  -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wno-pass-failed -Wmisleading-indentation -Wctad-maybe-unsupported /Gw -Wno-deprecated-copy -Wno-string-conversion -Wno-ctad-maybe-unsupported /O2 /Ob2  -std:c++17 -MD -UNDEBUG /EHs-c- /GR- /showIncludes /Fotools\flang\lib\Lower\CMakeFiles\FortranLower.dir\OpenMP\OpenMP.cpp.obj /Fdtools\flang\lib\Lower\CMakeFiles\FortranLower.dir\FortranLower.pdb -c -- C:\_work\llvm-project\llvm-project\flang\lib\Lower\OpenMP\OpenMP.cpp
In file included from C:\_work\llvm-project\llvm-project\flang\lib\Lower\OpenMP\OpenMP.cpp:44:
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(58,1): error: version control conflict marker in file
58 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(199,1): error: version control conflict marker in file
199 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(257,1): error: version control conflict marker in file
257 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
3 errors generated.
```
</details>
<details>
<summary>[code=1] tools/flang/unittests/Semantics/CMakeFiles/OpenMPUtilsTests.dir/OpenMPUtils.cpp.obj</summary>

```
FAILED: [code=1] tools/flang/unittests/Semantics/CMakeFiles/OpenMPUtilsTests.dir/OpenMPUtils.cpp.obj
sccache C:\clang\clang-msvc\bin\clang-cl.exe  /nologo -TP -DCLANG_BUILD_STATIC -DFLANG_INCLUDE_TESTS=1 -DLLVM_BUILD_STATIC -DUNICODE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_GLIBCXX_ASSERTIONS -D_HAS_EXCEPTIONS=0 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -IC:\_work\llvm-project\llvm-project\build\tools\flang\unittests\Semantics -IC:\_work\llvm-project\llvm-project\flang\unittests\Semantics -IC:\_work\llvm-project\llvm-project\flang\include -IC:\_work\llvm-project\llvm-project\build\tools\flang\include -IC:\_work\llvm-project\llvm-project\build\include -IC:\_work\llvm-project\llvm-project\llvm\include -IC:\_work\llvm-project\llvm-project\third-party\unittest\googletest\include -IC:\_work\llvm-project\llvm-project\third-party\unittest\googlemock\include -imsvcC:\_work\llvm-project\llvm-project\flang\..\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\mlir\include -imsvcC:\_work\llvm-project\llvm-project\build\tools\clang\include -imsvcC:\_work\llvm-project\llvm-project\llvm\..\clang\include /DWIN32 /D_WINDOWS   /Zc:inline /Zc:__cplusplus /Oi /Brepro /bigobj /permissive- -Werror=unguarded-availability-new /W4  -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wno-pass-failed -Wmisleading-indentation -Wctad-maybe-unsupported /Gw -Wno-deprecated-copy -Wno-string-conversion -Wno-ctad-maybe-unsupported /O2 /Ob2  -std:c++17 -MD -UNDEBUG -Wno-suggest-override -Wno-gnu-zero-variadic-macro-arguments /EHs-c- /GR- /showIncludes /Fotools\flang\unittests\Semantics\CMakeFiles\OpenMPUtilsTests.dir\OpenMPUtils.cpp.obj /Fdtools\flang\unittests\Semantics\CMakeFiles\OpenMPUtilsTests.dir\ -c -- C:\_work\llvm-project\llvm-project\flang\unittests\Semantics\OpenMPUtils.cpp
In file included from C:\_work\llvm-project\llvm-project\flang\unittests\Semantics\OpenMPUtils.cpp:15:
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(58,1): error: version control conflict marker in file
58 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(199,1): error: version control conflict marker in file
199 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
C:\_work\llvm-project\llvm-project\flang\include\flang/Semantics/openmp-utils.h(257,1): error: version control conflict marker in file
257 | <<<<<<< users/kparzysz/e21-is-rectangular
| ^
3 errors generated.
```
</details>

If these failures are unrelated to your changes (for example tests are broken or flaky at HEAD), please open an issue at https://github.com/llvm/llvm-project/issues and add the `infrastructure` label.

https://github.com/llvm/llvm-project/pull/190648