Skip to content

[Flang][runtime] Fix RENAME intrinsic, remove trailing blanks #159123

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

Merged
mjklemm merged 8 commits into from
Sep 17, 2025
Merged

[Flang][runtime] Fix RENAME intrinsic, remove trailing blanks #159123

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
664be1d
[Flang][runtime] Fix RENAME intrinsic, remove trailing blanks
mjklemm Sep 16, 2025
b20d0ab
Update flang-rt/lib/runtime/misc-intrinsic.cpp
mjklemm Sep 16, 2025
6827079
Introduce function IsNullTerminated
mjklemm Sep 17, 2025
8b60514
Add proper handling of null-terminated character strings
mjklemm Sep 17, 2025
8e9305e
Remove sizeof
mjklemm Sep 17, 2025
58cbad6
Revert "Introduce function IsNullTerminated"
mjklemm Sep 17, 2025
b5101da
Simplify code
mjklemm Sep 17, 2025
14cbc44
Cleanup
mjklemm Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions flang-rt/lib/runtime/misc-intrinsic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,22 @@ RT_EXT_API_GROUP_BEGIN
void RTDEF(Rename)(const Descriptor &path1, const Descriptor &path2,
const Descriptor *status, const char *sourceFile, int line) {
Terminator terminator{sourceFile, line};

// Semantics for character strings: A null character (CHAR(0)) can be used to
// mark the end of the names in PATH1 and PATH2; otherwise, trailing blanks in
// the file names are ignored.
// (https://gcc.gnu.org/onlinedocs/gfortran/RENAME.html)
#if !defined(RT_DEVICE_COMPILATION)
char *pathSrc{EnsureNullTerminated(
path1.OffsetElement(), path1.ElementBytes(), terminator)};
char *pathDst{EnsureNullTerminated(
path2.OffsetElement(), path2.ElementBytes(), terminator)};
// Trim tailing spaces, respect presences of null character when doing so.
auto pathSrc{SaveDefaultCharacter(path1.OffsetElement(),
TrimTrailingSpaces(path1.OffsetElement(), path1.ElementBytes()),
terminator)};
auto pathDst{SaveDefaultCharacter(path2.OffsetElement(),
TrimTrailingSpaces(path2.OffsetElement(), path2.ElementBytes()),
terminator)};

// We simply call rename(2) from POSIX
int result{rename(pathSrc, pathDst)};
// We can now simply call rename(2) from POSIX.
int result{rename(pathSrc.get(), pathDst.get())};
if (status) {
// When an error has happened,
int errorCode{0}; // Assume success
Expand All @@ -76,14 +84,6 @@ void RTDEF(Rename)(const Descriptor &path1, const Descriptor &path2,
}
StoreIntToDescriptor(status, errorCode, terminator);
}

// Deallocate memory if EnsureNullTerminated dynamically allocated memory
if (pathSrc != path1.OffsetElement()) {
FreeMemory(pathSrc);
}
if (pathDst != path2.OffsetElement()) {
FreeMemory(pathDst);
}
#else // !defined(RT_DEVICE_COMPILATION)
terminator.Crash("RENAME intrinsic is only supported on host devices");
#endif // !defined(RT_DEVICE_COMPILATION)
Expand Down
Loading