[multiple changes]

[gcc.git] / gcc / tree-nrv.c

diff --git a/gcc/tree-nrv.c b/gcc/tree-nrv.c
index 0df0712d19c301bf8795fc26926afcb01f86715c..71de0db82c2279b5080c4e1770ce89385f07061c 100644 (file)
--- a/gcc/tree-nrv.c
+++ b/gcc/tree-nrv.c
@@ -154,6 +154,7 @@ tree_nrv (void)
          /* The returned value must be a local automatic variable of the
             same type and alignment as the function's result.  */
          if (TREE_CODE (found) != VAR_DECL
+             || TREE_THIS_VOLATILE (found)
              || DECL_CONTEXT (found) != current_function_decl
              || TREE_STATIC (found)
              || TREE_ADDRESSABLE (found)