From 3ab209b58e0416f48178bd792156d338a37c30fd Mon Sep 17 00:00:00 2001 From: Peter Steinfeld Date: Thu, 6 Jun 2019 14:05:02 -0700 Subject: [PATCH] [flang] Changes in response to Peter's comments on a previous pull request. Specifically, that the conversion of warnings to errors will happen in a single place in the compiler once we implement warnings as distinct from errors. This change made on of the tests invalid. Also, there's no need to check whether the extension to allow REAL DO controls is enabled. Original-commit: flang-compiler/f18@2fae9edd77b930cef8ececb16d719f16477ef3b0 Reviewed-on: https://github.com/flang-compiler/f18/pull/478 Tree-same-pre-rewrite: false --- flang/lib/semantics/check-do-stmt.cc | 10 +- flang/test/semantics/CMakeLists.txt | 1 - flang/test/semantics/dosemantics03.f90 | 20 --- flang/test/semantics/dosemantics04.f90 | 231 ------------------------- 4 files changed, 5 insertions(+), 257 deletions(-) delete mode 100644 flang/test/semantics/dosemantics04.f90 diff --git a/flang/lib/semantics/check-do-stmt.cc b/flang/lib/semantics/check-do-stmt.cc index dbd59d64054f..b7664974302a 100644 --- a/flang/lib/semantics/check-do-stmt.cc +++ b/flang/lib/semantics/check-do-stmt.cc @@ -398,12 +398,12 @@ private: } void CheckDoControl(parser::CharBlock sourceLocation, bool isReal) { - bool warn = context_.warnOnNonstandardUsage() || - context_.ShouldWarn(parser::LanguageFeature::RealDoControls); - bool enabled = context_.IsEnabled(parser::LanguageFeature::RealDoControls); - if (isReal && enabled && !(warn)) { + bool warn{context_.warnOnNonstandardUsage() || + context_.ShouldWarn(parser::LanguageFeature::RealDoControls)}; + if (isReal && !warn) { // No messages for the default case - } else if (isReal && enabled && warn && !context_.warningsAreErrors()) { + } else if (isReal && warn) { + // TODO: Mark the following message as a warning when we have warnings context_.Say(sourceLocation, "DO controls should be INTEGER"_en_US); } else { context_.Say(sourceLocation, "DO controls should be INTEGER"_err_en_US); diff --git a/flang/test/semantics/CMakeLists.txt b/flang/test/semantics/CMakeLists.txt index 12a8a8883040..33aa5f06a63e 100644 --- a/flang/test/semantics/CMakeLists.txt +++ b/flang/test/semantics/CMakeLists.txt @@ -125,7 +125,6 @@ set(ERROR_TESTS dosemantics01.f90 dosemantics02.f90 dosemantics03.f90 - dosemantics04.f90 expr-errors01.f90 null01.f90 ) diff --git a/flang/test/semantics/dosemantics03.f90 b/flang/test/semantics/dosemantics03.f90 index b438a3ad3817..0b9c4de204ea 100644 --- a/flang/test/semantics/dosemantics03.f90 +++ b/flang/test/semantics/dosemantics03.f90 @@ -19,10 +19,6 @@ ! conformance and turning warnings into errors. This produces error ! messages for the cases where REAL and DOUBLE PRECISION variables ! and expressions are used in the DO controls. -! -! This test is just like dosemantics04.f90 but with the options -! to produce error messages when using REAL and DOUBLE PRECISION DO -! loop controls. !OPTIONS: -Mstandard -Werror @@ -52,13 +48,11 @@ PROGRAM do_issue_458 END DO ! REAL DO variable -!ERROR: DO controls should be INTEGER DO rvar = 1, 10, 3 PRINT *, "rvar is: ", rvar END DO ! DOUBLE PRECISISON DO variable -!ERROR: DO controls should be INTEGER DO dvar = 1, 10, 3 PRINT *, "dvar is: ", dvar END DO @@ -71,14 +65,12 @@ PROGRAM do_issue_458 ! Pointer to REAL DO variable ALLOCATE(prvar) -!ERROR: DO controls should be INTEGER DO prvar = 1, 10, 3 PRINT *, "prvar is: ", prvar END DO ! Pointer to DOUBLE PRECISION DO variable ALLOCATE(pdvar) -!ERROR: DO controls should be INTEGER DO pdvar = 1, 10, 3 PRINT *, "pdvar is: ", pdvar END DO @@ -116,13 +108,11 @@ PROGRAM do_issue_458 ! Initial expressions ! REAL initial expression -!ERROR: DO controls should be INTEGER DO ivar = rvar, 10, 3 PRINT *, "ivar is: ", ivar END DO ! DOUBLE PRECISION initial expression -!ERROR: DO controls should be INTEGER DO ivar = dvar, 10, 3 PRINT *, "ivar is: ", ivar END DO @@ -133,13 +123,11 @@ PROGRAM do_issue_458 END DO ! Pointer to REAL initial expression -!ERROR: DO controls should be INTEGER DO ivar = prvar, 10, 3 PRINT *, "ivar is: ", ivar END DO ! Pointer to DOUBLE PRECISION initial expression -!ERROR: DO controls should be INTEGER DO ivar = pdvar, 10, 3 PRINT *, "ivar is: ", ivar END DO @@ -170,13 +158,11 @@ PROGRAM do_issue_458 ! Final expression ! REAL final expression -!ERROR: DO controls should be INTEGER DO ivar = 1, rvar, 3 PRINT *, "ivar is: ", ivar END DO ! DOUBLE PRECISION final expression -!ERROR: DO controls should be INTEGER DO ivar = 1, dvar, 3 PRINT *, "ivar is: ", ivar END DO @@ -187,13 +173,11 @@ PROGRAM do_issue_458 END DO ! Pointer to REAL final expression -!ERROR: DO controls should be INTEGER DO ivar = 1, prvar, 3 PRINT *, "ivar is: ", ivar END DO ! Pointer to DOUBLE PRECISION final expression -!ERROR: DO controls should be INTEGER DO ivar = pdvar, 10, 3 PRINT *, "ivar is: ", ivar END DO @@ -206,13 +190,11 @@ PROGRAM do_issue_458 ! Step expression ! REAL step expression -!ERROR: DO controls should be INTEGER DO ivar = 1, 10, rvar PRINT *, "ivar is: ", ivar END DO ! DOUBLE PRECISION step expression -!ERROR: DO controls should be INTEGER DO ivar = 1, 10, dvar PRINT *, "ivar is: ", ivar END DO @@ -223,13 +205,11 @@ PROGRAM do_issue_458 END DO ! Pointer to REAL step expression -!ERROR: DO controls should be INTEGER DO ivar = 1, 10, prvar PRINT *, "ivar is: ", ivar END DO ! Pointer to DOUBLE PRECISION step expression -!ERROR: DO controls should be INTEGER DO ivar = 1, 10, pdvar PRINT *, "ivar is: ", ivar END DO diff --git a/flang/test/semantics/dosemantics04.f90 b/flang/test/semantics/dosemantics04.f90 deleted file mode 100644 index 2a61912d86e3..000000000000 --- a/flang/test/semantics/dosemantics04.f90 +++ /dev/null @@ -1,231 +0,0 @@ -! Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved. -! -! Licensed under the Apache License, Version 2.0 (the "License"); -! you may not use this file except in compliance with the License. -! You may obtain a copy of the License at -! -! http://www.apache.org/licenses/LICENSE-2.0 -! -! Unless required by applicable law or agreed to in writing, software -! distributed under the License is distributed on an "AS IS" BASIS, -! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -! See the License for the specific language governing permissions and -! limitations under the License. - -! Issue 458 -- semantic checks for a normal DO loop. The DO variable -! and the initial, final, and step expressions must be INTEGER if the -! options for standard conformance and turning warnings into errors -! are both in effect. This test turns on the options for standards -! conformance and turning warnings into errors. This produces error -! messages for the cases where REAL and DOUBLE PRECISION variables -! and expressions are used in the DO controls. -! -! This test is just like dosemantics03.f90 but without the options -! to produce error messages when using REAL and DOUBLE PRECISION DO -! loop controls. - -PROGRAM do_issue_458 - IMPLICIT NONE - INTEGER :: ivar - REAL :: rvar - DOUBLE PRECISION :: dvar - LOGICAL :: lvar - COMPLEX :: cvar - CHARACTER :: chvar - INTEGER, DIMENSION(3) :: avar - TYPE derived - REAL :: first - INTEGER :: second - END TYPE derived - TYPE(derived) :: devar - INTEGER, POINTER :: pivar - REAL, POINTER :: prvar - DOUBLE PRECISION, POINTER :: pdvar - LOGICAL, POINTER :: plvar - -! DO variables -! INTEGER DO variable - DO ivar = 1, 10, 3 - PRINT *, "ivar is: ", ivar - END DO - -! REAL DO variable - DO rvar = 1, 10, 3 - PRINT *, "rvar is: ", rvar - END DO - -! DOUBLE PRECISISON DO variable - DO dvar = 1, 10, 3 - PRINT *, "dvar is: ", dvar - END DO - -! Pointer to INTEGER DO variable - ALLOCATE(pivar) - DO pivar = 1, 10, 3 - PRINT *, "pivar is: ", pivar - END DO - -! Pointer to REAL DO variable - ALLOCATE(prvar) - DO prvar = 1, 10, 3 - PRINT *, "prvar is: ", prvar - END DO - -! Pointer to DOUBLE PRECISION DO variable - ALLOCATE(pdvar) - DO pdvar = 1, 10, 3 - PRINT *, "pdvar is: ", pdvar - END DO - -! CHARACTER DO variable -!ERROR: DO controls should be INTEGER - DO chvar = 1, 10, 3 - PRINT *, "chvar is: ", chvar - END DO - -! LOGICAL DO variable -!ERROR: DO controls should be INTEGER - DO lvar = 1, 10, 3 - PRINT *, "lvar is: ", lvar - END DO - -! COMPLEX DO variable -!ERROR: DO controls should be INTEGER - DO cvar = 1, 10, 3 - PRINT *, "cvar is: ", cvar - END DO - -! Derived type DO variable -!ERROR: DO controls should be INTEGER - DO devar = 1, 10, 3 - PRINT *, "devar is: ", devar - END DO - -! Pointer to LOGICAL DO variable - ALLOCATE(plvar) -!ERROR: DO controls should be INTEGER - DO plvar = 1, 10, 3 - PRINT *, "plvar is: ", plvar - END DO - -! Initial expressions -! REAL initial expression - DO ivar = rvar, 10, 3 - PRINT *, "ivar is: ", ivar - END DO - -! DOUBLE PRECISION initial expression - DO ivar = dvar, 10, 3 - PRINT *, "ivar is: ", ivar - END DO - -! Pointer to INTEGER initial expression - DO ivar = pivar, 10, 3 - PRINT *, "ivar is: ", ivar - END DO - -! Pointer to REAL initial expression - DO ivar = prvar, 10, 3 - PRINT *, "ivar is: ", ivar - END DO - -! Pointer to DOUBLE PRECISION initial expression - DO ivar = pdvar, 10, 3 - PRINT *, "ivar is: ", ivar - END DO - -! LOGICAL initial expression -!ERROR: DO controls should be INTEGER - DO ivar = lvar, 10, 3 - PRINT *, "ivar is: ", ivar - END DO - -! COMPLEX initial expression -!ERROR: DO controls should be INTEGER - DO ivar = cvar, 10, 3 - PRINT *, "ivar is: ", ivar - END DO - -! Derived type initial expression -!ERROR: DO controls should be INTEGER - DO ivar = devar, 10, 3 - PRINT *, "ivar is: ", ivar - END DO - -! Pointer to LOGICAL initial expression -!ERROR: DO controls should be INTEGER - DO ivar = plvar, 10, 3 - PRINT *, "ivar is: ", ivar - END DO - -! Final expression -! REAL final expression - DO ivar = 1, rvar, 3 - PRINT *, "ivar is: ", ivar - END DO - -! DOUBLE PRECISION final expression - DO ivar = 1, dvar, 3 - PRINT *, "ivar is: ", ivar - END DO - -! Pointer to INTEGER final expression - DO ivar = 1, pivar, 3 - PRINT *, "ivar is: ", ivar - END DO - -! Pointer to REAL final expression - DO ivar = 1, prvar, 3 - PRINT *, "ivar is: ", ivar - END DO - -! Pointer to DOUBLE PRECISION final expression - DO ivar = pdvar, 10, 3 - PRINT *, "ivar is: ", ivar - END DO - -! COMPLEX final expression -!ERROR: DO controls should be INTEGER - DO ivar = 1, cvar, 3 - PRINT *, "ivar is: ", ivar - END DO - -! Step expression -! REAL step expression - DO ivar = 1, 10, rvar - PRINT *, "ivar is: ", ivar - END DO - -! DOUBLE PRECISION step expression - DO ivar = 1, 10, dvar - PRINT *, "ivar is: ", ivar - END DO - -! Pointer to INTEGER step expression - DO ivar = 1, 10, pivar - PRINT *, "ivar is: ", ivar - END DO - -! Pointer to REAL step expression - DO ivar = 1, 10, prvar - PRINT *, "ivar is: ", ivar - END DO - -! Pointer to DOUBLE PRECISION step expression - DO ivar = 1, 10, pdvar - PRINT *, "ivar is: ", ivar - END DO - -! COMPLEX Step expression -!ERROR: DO controls should be INTEGER - DO ivar = 1, 10, cvar - PRINT *, "ivar is: ", ivar - END DO - -! Array DO variable -!ERROR: Must be a scalar value, but is a rank-1 array - DO avar = 1, 10, 3 - PRINT *, "plvar is: ", plvar - END DO - -END PROGRAM do_issue_458