obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 37 insertions, 0 deletions

diff --git a/gcc/testsuite/gfortran.dg/fmt_error_2.f90 b/gcc/testsuite/gfortran.dg/fmt_error_2.f90
new file mode 100644
index 000000000..ae818da7f
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/fmt_error_2.f90
@@ -0,0 +1,37 @@
+! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
+! PR 33269: we used to not simplify format strings before checking if
+! they were valid, leading to a missed error.
+
+IMPLICIT CHARACTER*5 (h-z)
+
+CHARACTER*5 f
+CHARACTER*5 bad, good
+parameter(bad="a", good="(a)")
+
+PRINT ('a'), "hello" ! { dg-error "Missing leading left parenthesis in format string" }
+WRITE (*, ("a")) "error"  ! { dg-error "Missing leading left parenthesis in format string" }
+
+PRINT 'a', "hello" ! { dg-error "Missing leading left parenthesis in format string" }
+WRITE (*, "a") "error"  ! { dg-error "Missing leading left parenthesis in format string" }
+WRITE (*, bad) "error"  ! { dg-error "Missing leading left parenthesis in format string" }
+
+PRINT 'a' // ', a', "err", "or"   ! { dg-error "Missing leading left parenthesis in format string" }
+
+PRINT '(' // 'a'  ! { dg-error "Unexpected end of format string in format string" }
+
+! the following are ok
+PRINT "(2f5.3)", bar, foo
+PRINT ' (a)', "hello"
+WRITE (*, " ((a))") "hello"
+print "(a" // ")", "all is fine"
+print good, "great"
+
+! verify that we haven't broken non-constant expressions
+f = "(f5.3)"
+print f, 3.14159
+print (f), 2.71813
+print implicitly_typed, "something"
+write (*, implicitly_typed_as_well) "something else"
+END