Merge commit 'ff7aeceb6b3a476c3bac66a7f39a5ef4240206fc' [#247, #906]

5 files changed, 7 insertions, 7 deletions

diff --git a/gcc/rust/backend/rust-compile-expr.cc b/gcc/rust/backend/rust-compile-expr.cc
index ae4a841..d61a568 100644
--- a/gcc/rust/backend/rust-compile-expr.cc
+++ b/gcc/rust/backend/rust-compile-expr.cc
@@ -187,7 +187,7 @@ CompileExpr::visit (HIR::MatchExpr &expr)
      Operand 1 is CASE_HIGH.  If it is NULL_TREE, the label is a simple
        (one-value) case label.  If it is non-NULL_TREE, the case is a range.
      Operand 2 is CASE_LABEL, which has the corresponding LABEL_DECL.
-     Operand 3 is CASE_CHAIN.  This operand is only used in tree-cfg.c to
+     Operand 3 is CASE_CHAIN.  This operand is only used in tree-cfg.cc to
        speed up the lookup of case labels which use a particular edge in
        the control flow graph.  */
   // DEFTREECODE (CASE_LABEL_EXPR, "case_label_expr", tcc_statement, 4)
@@ -1128,7 +1128,7 @@ CompileExpr::array_copied_expr (Location expr_locus,
 				const TyTy::ArrayType &array_tyty,
 				tree array_type, HIR::ArrayElemsCopied &elems)
 {
-  //  see gcc/cp/typeck2.c:1369-1401
+  //  see gcc/cp/typeck2.cc:1369-1401
   gcc_assert (TREE_CODE (array_type) == ARRAY_TYPE);
   tree domain = TYPE_DOMAIN (array_type);
   if (!domain)
diff --git a/gcc/rust/backend/rust-compile-type.cc b/gcc/rust/backend/rust-compile-type.cc
index 11784c9..6de063b 100644
--- a/gcc/rust/backend/rust-compile-type.cc
+++ b/gcc/rust/backend/rust-compile-type.cc
@@ -28,7 +28,7 @@ namespace Compile {
 
 static const std::string RUST_ENUM_DISR_FIELD_NAME = "RUST$ENUM$DISR";
 
-// see: gcc/c/c-decl.c:8230-8241
+// see: gcc/c/c-decl.cc:8230-8241
 // https://github.com/Rust-GCC/gccrs/blob/0024bc2f028369b871a65ceb11b2fddfb0f9c3aa/gcc/c/c-decl.c#L8229-L8241
 tree
 TyTyResolveCompile::get_implicit_enumeral_node_type (Context *ctx)
diff --git a/gcc/rust/backend/rust-constexpr.cc b/gcc/rust/backend/rust-constexpr.cc
index 293f110..f1f969c 100644
--- a/gcc/rust/backend/rust-constexpr.cc
+++ b/gcc/rust/backend/rust-constexpr.cc
@@ -339,7 +339,7 @@ ConstCtx::constexpr_fn_retval (tree body)
   return error_mark_node;
 }
 
-// Taken from cp/constexpr.c
+// Taken from cp/constexpr.cc
 //
 // If DECL is a scalar enumeration constant or variable with a
 // constant initializer, return the initializer (or, its initializers,
@@ -397,7 +397,7 @@ non_const_var_error (location_t loc, tree r)
   if (DECL_INITIAL (r) == error_mark_node)
     return;
 
-  // more in cp/constexpr.c
+  // more in cp/constexpr.cc
 }
 
 static tree
diff --git a/gcc/rust/lang-specs.h b/gcc/rust/lang-specs.h
index c3230e4..9b14a55 100644
--- a/gcc/rust/lang-specs.h
+++ b/gcc/rust/lang-specs.h
@@ -17,7 +17,7 @@
    along with GCC; see the file COPYING3.  If not see
    <http://www.gnu.org/licenses/>.  */
 
-/* This is the contribution to the `default_compilers' array in gcc.c
+/* This is the contribution to the `default_compilers' array in gcc.cc
    for the Rust language.  */
 
 {".rs", "@rs", 0, 1, 0},
diff --git a/gcc/rust/rust-lang.cc b/gcc/rust/rust-lang.cc
index b1e6907..a0f14d4 100644
--- a/gcc/rust/rust-lang.cc
+++ b/gcc/rust/rust-lang.cc
@@ -308,7 +308,7 @@ grs_langhook_post_options (const char **pfilename ATTRIBUTE_UNUSED)
 {
   // can be used to override other options if required
 
-  // satisfies an assert in init_excess_precision in toplev.c
+  // satisfies an assert in init_excess_precision in toplev.cc
   if (flag_excess_precision /*_cmdline*/ == EXCESS_PRECISION_DEFAULT)
     flag_excess_precision /*_cmdline*/ = EXCESS_PRECISION_STANDARD;