New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pointer assignment semantic checks #928

Merged

tskeith merged 6 commits into master from tsk-assignment3

Jan 14, 2020

Collaborator

tskeith commented Jan 14, 2020

See individual commits.

tskeith requested review from klausler and psteinfeld

January 14, 2020 00:40

klausler reviewed

View reviewed changes

lib/evaluate/characteristics.cc

@@ @@ -636,7 +638,7 @@ std::optional<Procedure> Procedure::Characterize( @@
                         [&](const semantics::ProcEntityDetails &proc)
                             -> std::optional<Procedure> {
                           if (symbol.attrs().test(semantics::Attr::INTRINSIC)) {
-                            return intrinsics.IsUnrestrictedSpecificIntrinsicFunction(
+                            return intrinsics.IsSpecificIntrinsicFunction(

Collaborator

klausler Jan 14, 2020

Could you summarize for me what's changed here? Do you permit procedure pointers to point to restricted specific intrinsic functions?

Collaborator Author

tskeith Jan 14, 2020

The change is to be able to detect specific intrinsic functions, both restricted and unrestricted. IsSpecificIntrinsicFunction returns a struct that has a flag to distinguish restricted and unrestricted. That flag is propagated to SpecificIntrinsic in ProcedureDesignator by ExpressionAnalyzer::Designate.

The new tests in resolve46.f90 verify that procedure pointers can't point to restricted specific intrinsic functions.

klausler reviewed

View reviewed changes

lib/semantics/check-declarations.cc Outdated Show resolved Hide resolved

psteinfeld approved these changes

View reviewed changes

Collaborator

psteinfeld left a comment

Aside from the uncapitalized messages in assignment.cc, all builds, tests, and looks good.

lib/semantics/assignment.cc

-                  Say(elsewhereStmt.source,
-                      "mask of ELSEWHERE statement is not conformable with "
-                      "the prior mask(s) in its WHERE construct"_err_en_US);
+                  context_.Say("mask of ELSEWHERE statement is not conformable with "

Collaborator

psteinfeld Jan 14, 2020

Other error messages begin with a capital letter.

lib/semantics/assignment.cc

-                for (const auto &x :
-                    std::get<std::list<parser::WhereBodyConstruct>>(elsewhere.t)) {
-                  Analyze(x);
+                  context_.Say("effective mask of ELSEWHERE statement is not conformable "

Collaborator

psteinfeld Jan 14, 2020

I couldn't find a test that produces this error message.

lib/semantics/pointer-assignment.cc

+              template<typename A> void PointerAssignmentChecker::Check(const A &) {
+                // Catch-all case for really bad target expression
+                Say("Target associated with %s must be a designator or a call to a"

Collaborator

psteinfeld Jan 14, 2020

No test case for this message.

lib/semantics/pointer-assignment.cc

+                std::optional<parser::MessageFixedText> msg;
+                const auto &funcResult{proc->functionResult};  // C1025
+                if (!funcResult) {
+                  msg = "%s is associated with the non-existent result of reference to"

Collaborator

psteinfeld Jan 14, 2020

I didn't find a test case for this message.

lib/semantics/pointer-assignment.cc

+                        " procedure"_err_en_US;
+                } else if (procedure_) {
+                  // Shouldn't be here in this function unless lhs is an object pointer.
+                  msg = "Procedure %s is associated with the result of a reference to"

Collaborator

psteinfeld Jan 14, 2020

I didn't find a test case for this message.

lib/semantics/pointer-assignment.cc

+                std::optional<parser::MessageFixedText> msg;
+                if (procedure_) {
+                  // Shouldn't be here in this function unless lhs is an object pointer.
+                  msg = "In assignment to procedure %s, the target is not a procedure or"

Collaborator

psteinfeld Jan 14, 2020

No test for this message.

lib/semantics/pointer-assignment.cc

+                  msg = "In assignment to procedure %s, the target is not a procedure or"
+                        " procedure pointer"_err_en_US;
+                } else if (!evaluate::GetLastTarget(GetSymbolVector(d))) {  // C1025
+                  msg = "In assignment to object %s, the target '%s' is not an object with"

Collaborator

psteinfeld Jan 14, 2020

No test for this message.

lib/semantics/pointer-assignment.cc

+                        " POINTER or TARGET attributes"_err_en_US;
+                } else if (auto rhsType{TypeAndShape::Characterize(*last, context_)}) {
+                  if (!lhsType_) {
+                    msg = "%s associated with object '%s' with incompatible type or"

Collaborator

psteinfeld Jan 14, 2020

No test for this message.

lib/semantics/pointer-assignment.cc

+                  parser::CharBlock rhsName, bool isCall, const Procedure *rhsProcedure) {
+                std::optional<parser::MessageFixedText> msg;
+                if (!procedure_) {
+                  msg = "In assignment to object %s, the target '%s' is a procedure"

Collaborator

psteinfeld Jan 14, 2020

No test for this message.

lib/semantics/pointer-assignment.cc

+                  msg = "In assignment to object %s, the target '%s' is a procedure"
+                        " designator"_err_en_US;
+                } else if (!rhsProcedure) {
+                  msg = "In assignment to procedure %s, the characteristics of the target"

Collaborator

psteinfeld Jan 14, 2020

No test for this message.

Collaborator

psteinfeld Jan 14, 2020

I just noticed that all of these messages without tests were just copied from assignment.cc. Feel free to ignore my comments.

klausler approved these changes

View reviewed changes

tskeith added 6 commits

January 14, 2020 13:02


          Clean up AssignmentContext

e171029

Eliminate `at_` and use location from `SemanticsContext` instead.

Add and use Analyze functions for `std::optional` and `std::list`.


          Move pointer assignment checking to its own file

1658aba

Create `pointer-assignment.{h,cc}` for pointer assignment checking.
It doesn't share with assignment checking so it should be its own file.
Move the code into semantics namespace.


          Make Fortran form of intrinsic types uppercase

e16909d

`DynamicType::AsFortran` was using mixed case for intrinic type names.
Make it upper case for consistency with TYPE(...) and CHARACTER when a
length is present and other error messages.


          Add IntrinsicProcTable::IsSpecificIntrinsicFunction

4cb1ee1

This replaces IsUnrestrictedSpecificIntrinsicFunction and returns
information that allows the caller to distinguish between restricted
and unrestricted intrinsics.

The new case in `resolve46.f90` used to get an internal error.


          C1027: procedure pointer may not be coindexed object

4261daf


          Pointer assignment semantic checks

3dc5fd6

Call `CheckPointerAssignment()` when analyzing a pointer assignment
statement. NOTE: the cases with bounds-spec and bounds-remapping are
still to be done.

Perform checks on pointer symbols in `check-declarations.cc`.

Check for pointer to generic intrinsic in `semantics/expression.cc`.

Add the other required pointer assignment checks to `pointer-assignment.cc`.

tskeith force-pushed the tsk-assignment3 branch from 23b5195 to 3dc5fd6 Compare

January 14, 2020 21:08

tskeith merged commit fc600af into master

tskeith deleted the tsk-assignment3 branch

January 14, 2020 21:09

swift-ci pushed a commit to apple/llvm-project that referenced this pull request


          [flang] Clean up AssignmentContext

ce3d838

Eliminate `at_` and use location from `SemanticsContext` instead.

Add and use Analyze functions for `std::optional` and `std::list`.

Original-commit: flang-compiler/f18@e171029
Reviewed-on: flang-compiler/f18#928
Tree-same-pre-rewrite: false

swift-ci pushed a commit to apple/llvm-project that referenced this pull request


          [flang] Move pointer assignment checking to its own file

c42a220

Create `pointer-assignment.{h,cc}` for pointer assignment checking.
It doesn't share with assignment checking so it should be its own file.
Move the code into semantics namespace.

Original-commit: flang-compiler/f18@1658aba
Reviewed-on: flang-compiler/f18#928
Tree-same-pre-rewrite: false

swift-ci pushed a commit to apple/llvm-project that referenced this pull request


          [flang] Make Fortran form of intrinsic types uppercase

355ab9b

`DynamicType::AsFortran` was using mixed case for intrinic type names.
Make it upper case for consistency with TYPE(...) and CHARACTER when a
length is present and other error messages.

Original-commit: flang-compiler/f18@e16909d
Reviewed-on: flang-compiler/f18#928
Tree-same-pre-rewrite: false

swift-ci pushed a commit to apple/llvm-project that referenced this pull request


          [flang] Add IntrinsicProcTable::IsSpecificIntrinsicFunction

a5db74b

This replaces IsUnrestrictedSpecificIntrinsicFunction and returns
information that allows the caller to distinguish between restricted
and unrestricted intrinsics.

The new case in `resolve46.f90` used to get an internal error.

Original-commit: flang-compiler/f18@4cb1ee1
Reviewed-on: flang-compiler/f18#928
Tree-same-pre-rewrite: false

swift-ci pushed a commit to apple/llvm-project that referenced this pull request


          [flang] C1027: procedure pointer may not be coindexed object

cfedf1d

Original-commit: flang-compiler/f18@4261daf
Reviewed-on: flang-compiler/f18#928
Tree-same-pre-rewrite: false

swift-ci pushed a commit to apple/llvm-project that referenced this pull request


          [flang] Pointer assignment semantic checks

cb37808

Call `CheckPointerAssignment()` when analyzing a pointer assignment
statement. NOTE: the cases with bounds-spec and bounds-remapping are
still to be done.

Perform checks on pointer symbols in `check-declarations.cc`.

Check for pointer to generic intrinsic in `semantics/expression.cc`.

Add the other required pointer assignment checks to `pointer-assignment.cc`.

Original-commit: flang-compiler/f18@3dc5fd6
Reviewed-on: flang-compiler/f18#928

swift-ci pushed a commit to apple/llvm-project that referenced this pull request


          [flang] Merge pull request flang-compiler/f18#928 from flang-compiler…

b4eade7

…/tsk-assignment3

Pointer assignment semantic checks

Original-commit: flang-compiler/f18@fc600af
Reviewed-on: flang-compiler/f18#928

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request


          [flang] Clean up AssignmentContext

274c1db

Eliminate `at_` and use location from `SemanticsContext` instead.

Add and use Analyze functions for `std::optional` and `std::list`.

Original-commit: flang-compiler/f18@e171029
Reviewed-on: flang-compiler/f18#928
Tree-same-pre-rewrite: false

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request


          [flang] Move pointer assignment checking to its own file

dc6efb7

Create `pointer-assignment.{h,cc}` for pointer assignment checking.
It doesn't share with assignment checking so it should be its own file.
Move the code into semantics namespace.

Original-commit: flang-compiler/f18@1658aba
Reviewed-on: flang-compiler/f18#928
Tree-same-pre-rewrite: false

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request


          [flang] Make Fortran form of intrinsic types uppercase

780d361

`DynamicType::AsFortran` was using mixed case for intrinic type names.
Make it upper case for consistency with TYPE(...) and CHARACTER when a
length is present and other error messages.

Original-commit: flang-compiler/f18@e16909d
Reviewed-on: flang-compiler/f18#928
Tree-same-pre-rewrite: false

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request


          [flang] Add IntrinsicProcTable::IsSpecificIntrinsicFunction

f9c5d30

This replaces IsUnrestrictedSpecificIntrinsicFunction and returns
information that allows the caller to distinguish between restricted
and unrestricted intrinsics.

The new case in `resolve46.f90` used to get an internal error.

Original-commit: flang-compiler/f18@4cb1ee1
Reviewed-on: flang-compiler/f18#928
Tree-same-pre-rewrite: false

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request


          [flang] C1027: procedure pointer may not be coindexed object

1bb8b7a

Original-commit: flang-compiler/f18@4261daf
Reviewed-on: flang-compiler/f18#928
Tree-same-pre-rewrite: false

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request


          [flang] Pointer assignment semantic checks

c0658a4

Call `CheckPointerAssignment()` when analyzing a pointer assignment
statement. NOTE: the cases with bounds-spec and bounds-remapping are
still to be done.

Perform checks on pointer symbols in `check-declarations.cc`.

Check for pointer to generic intrinsic in `semantics/expression.cc`.

Add the other required pointer assignment checks to `pointer-assignment.cc`.

Original-commit: flang-compiler/f18@3dc5fd6
Reviewed-on: flang-compiler/f18#928

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment