shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

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

Browse Source 
The RENAME intrinsic did not correctly remove trailing spaces from
filenames. This PR introduces code to remove trailing blanks as
documented by GFortran.

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Michael Klemm 2025-09-17 19:10:39 +02:00 committed by GitHub
parent 0227b791ff
commit 9e3ec0e371
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
flang-rt/lib/runtime/misc-intrinsic.cpp
View File

@ -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};
#if !defined(RT_DEVICE_COMPILATION)
char *pathSrc{EnsureNullTerminated(
path1.OffsetElement(), path1.ElementBytes(), terminator)};
char *pathDst{EnsureNullTerminated(
path2.OffsetElement(), path2.ElementBytes(), terminator)};
// We simply call rename(2) from POSIX
int result{rename(pathSrc, pathDst)};
// 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)
// 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 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
@ -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)