[flang] C_LOC is PURE #89437
Merged
[flang] C_LOC is PURE #89437
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The standard defines C_LOC as being PURE (actually SIMPLE now in F'2023); characterize it appropriately. Fixes llvm#88747.
llvmbot
added
flang
|
@llvm/pr-subscribers-flang-semantics Author: Peter Klausler (klausler) ChangesThe standard defines C_LOC as being PURE (actually SIMPLE now in F'2023); characterize it appropriately. Fixes #88747. Full diff: https://github.com/llvm/llvm-project/pull/89437.diff 2 Files Affected:
diff --git a/flang/lib/Evaluate/intrinsics.cpp b/flang/lib/Evaluate/intrinsics.cpp
index 7226d69f6391c7..f07f94b1a022c9 100644
--- a/flang/lib/Evaluate/intrinsics.cpp
+++ b/flang/lib/Evaluate/intrinsics.cpp
@@ -2862,7 +2862,8 @@ std::optional<SpecificCall> IntrinsicProcTable::Implementation::HandleC_Loc(
characteristics::DummyArgument{"x"s,
characteristics::DummyDataObject{
std::move(*typeAndShape)}}},
- characteristics::Procedure::Attrs{}}},
+ characteristics::Procedure::Attrs{
+ characteristics::Procedure::Attr::Pure}}},
std::move(arguments)};
}
}
diff --git a/flang/module/__fortran_builtins.f90 b/flang/module/__fortran_builtins.f90
index 3d3dbef6d018aa..4746ca20a13a7e 100644
--- a/flang/module/__fortran_builtins.f90
+++ b/flang/module/__fortran_builtins.f90
@@ -18,6 +18,7 @@
private
intrinsic :: __builtin_c_loc
+ public :: __builtin_c_loc
intrinsic :: __builtin_c_f_pointer
public :: __builtin_c_f_pointer
@@ -56,8 +57,6 @@
integer, parameter, public :: &
__builtin_atomic_logical_kind = __builtin_atomic_int_kind
- procedure(type(__builtin_c_ptr)), public :: __builtin_c_loc
-
type, public :: __builtin_dim3
integer :: x=1, y=1, z=1
end type
|
DanielCChen
approved these changes
Apr 20, 2024
There was a problem hiding this comment.
LGTM.
All test cases marked by issue #88747 are fixed by this PR. Thanks!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The standard defines C_LOC as being PURE (actually SIMPLE now in F'2023); characterize it appropriately.
Fixes #88747.