* trans-expr.c (gfc_trans_string_copy): Convert both dest and

	src to void *.

	PR fortran/34247
	* trans-openmp.c (gfc_omp_privatize_by_reference): For REFERENCE_TYPE
	pass by reference only PARM_DECLs or non-artificial decls.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@130492 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 19eba46..b117d18 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-28  Jakub Jelinek  <jakub@redhat.com>
+
+       * trans-expr.c (gfc_trans_string_copy): Convert both dest and
+       src to void *.
+
+       PR fortran/34247
+       * trans-openmp.c (gfc_omp_privatize_by_reference): For REFERENCE_TYPE
+       pass by reference only PARM_DECLs or non-artificial decls.
+
 2007-11-27  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        PR fortran/32928

diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index e3e98b9..493f73b 100644 (file)
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -2708,7 +2708,10 @@ gfc_trans_string_copy (stmtblock_t * block, tree dlength, tree dest,
 
      We're now doing it here for better optimization, but the logic
      is the same.  */
-  
+
+  dest = fold_convert (pvoid_type_node, dest);
+  src = fold_convert (pvoid_type_node, src);
+
   /* Truncate string if source is too long.  */
   cond2 = fold_build2 (GE_EXPR, boolean_type_node, slen, dlen);
   tmp2 = build_call_expr (built_in_decls[BUILT_IN_MEMMOVE],

diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
index 047c2b8..ea595a0 100644 (file)
--- a/gcc/fortran/trans-openmp.c
+++ b/gcc/fortran/trans-openmp.c
@@ -44,7 +44,8 @@ gfc_omp_privatize_by_reference (const_tree decl)
 {
   tree type = TREE_TYPE (decl);
 
-  if (TREE_CODE (type) == REFERENCE_TYPE)
+  if (TREE_CODE (type) == REFERENCE_TYPE
+      && (!DECL_ARTIFICIAL (decl) || TREE_CODE (decl) == PARM_DECL))
     return true;
 
   if (TREE_CODE (type) == POINTER_TYPE)