Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/llvm/llvm-project.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuinn Pham <Quinn.Pham@ibm.com>2021-11-15 18:52:20 +0300
committerQuinn Pham <Quinn.Pham@ibm.com>2021-11-26 00:11:10 +0300
commitb90eef30048dfd1976b01dfdfec66af911721288 (patch)
tree484e11eedc97425b1ccd6b1a60544e8049bcbe3f /flang/docs
parent3107081e941379bf62c02543c7396ad01349edc4 (diff)
[NFC][flang] Inclusive language: remove instances of master
[NFC] As part of using inclusive language within the llvm project, this patch: - replaces master with main in C++style.md to match the renaming of the master branch, - removes master from `FortranIR.md` where it is superfluous, - renames a logical variable in `pre-fir-tree04.f90` containing master. Reviewed By: ZarkoCA Differential Revision: https://reviews.llvm.org/D113923
Diffstat (limited to 'flang/docs')
-rw-r--r--flang/docs/C++style.md2
-rw-r--r--flang/docs/FortranIR.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/flang/docs/C++style.md b/flang/docs/C++style.md
index 16d0b1bc4744..d4d692a522d0 100644
--- a/flang/docs/C++style.md
+++ b/flang/docs/C++style.md
@@ -19,7 +19,7 @@ This document captures the style guide rules that are followed in the Flang code
* Use *clang-format*
from llvm 7
on all C++ source and header files before
-every merge to master. All code layout should be determined
+every merge to main. All code layout should be determined
by means of clang-format.
* Where a clear precedent exists in the project, follow it.
* Otherwise, where [LLVM's C++ style guide](https://llvm.org/docs/CodingStandards.html#style-issues)
diff --git a/flang/docs/FortranIR.md b/flang/docs/FortranIR.md
index f1f643a1d17d..ed322bd06fbf 100644
--- a/flang/docs/FortranIR.md
+++ b/flang/docs/FortranIR.md
@@ -145,7 +145,7 @@ Once the basic blocks are constructed, CFG edges defined, and the CFG is simplif
_Program_: A program instance is the top-level object that contains the representation of all the code being compiled, the compilation unit. It contains a list of procedures and a reference to the global symbol table.
-_Procedure_: This is a named Fortran procedure (subroutine or function). It contains a (hierarchical) list of regions. It also owns the master list of all basic blocks for the procedure.
+_Procedure_: This is a named Fortran procedure (subroutine or function). It contains a (hierarchical) list of regions. It also owns a list of all basic blocks for the procedure.
_Region_: A region is owned by a procedure or by another region. A region owns a reference to a scope in the symbol table tree. The list of delineated basic blocks can also be requested from a region.