summaryrefslogtreecommitdiffstats
path: root/libgomp
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2013-12-17 15:17:00 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2013-12-17 15:17:00 +0000
commit6eba44a7f05f669e90a11338c2f983e0d2ab79c4 (patch)
tree2a47859b3e2cbbba9c2e606294434a73e594707a /libgomp
parent43e4f6e8620642ba6ab42473ca09fa43f9603c81 (diff)
downloadppe42-gcc-6eba44a7f05f669e90a11338c2f983e0d2ab79c4.tar.gz
ppe42-gcc-6eba44a7f05f669e90a11338c2f983e0d2ab79c4.zip
PR testsuite/59534
* testsuite/libgomp.fortran/retval1.f90 (e5): Avoid non-shortcircuited comparisons. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206051 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
-rw-r--r--libgomp/ChangeLog6
-rw-r--r--libgomp/testsuite/libgomp.fortran/retval1.f904
2 files changed, 8 insertions, 2 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 566a4c12752..308b9219004 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-17 Jakub Jelinek <jakub@redhat.com>
+
+ PR testsuite/59534
+ * testsuite/libgomp.fortran/retval1.f90 (e5): Avoid non-shortcircuited
+ comparisons.
+
2013-12-16 Jakub Jelinek <jakub@redhat.com>
PR libgomp/58756
diff --git a/libgomp/testsuite/libgomp.fortran/retval1.f90 b/libgomp/testsuite/libgomp.fortran/retval1.f90
index 8bb07f8fce6..b25945731e9 100644
--- a/libgomp/testsuite/libgomp.fortran/retval1.f90
+++ b/libgomp/testsuite/libgomp.fortran/retval1.f90
@@ -91,8 +91,8 @@ entry e5 (is_f5)
l = .false.
!$omp parallel firstprivate (f5, e5) shared (is_f5) num_threads (2) &
!$omp reduction (.or.:l)
- l = .not. is_f5 .and. e5 .ne. 8
- l = l .or. (is_f5 .and. f5 .ne. 6.5)
+ if (.not. is_f5) l = l .or. e5 .ne. 8
+ if (is_f5) l = l .or. f5 .ne. 6.5
if (omp_get_thread_num () .eq. 0) e5 = 8
if (omp_get_thread_num () .eq. 1) e5 = 14
f5 = e5 - 4.5
OpenPOWER on IntegriCloud