Author: Valentin Clement (バレンタイン クレメン) Date: 2024-11-01T10:39:56-07:00 New Revision: 704c0b8e429443150ef4b58fc654ef6087f90e03
URL: https://github.com/llvm/llvm-project/commit/704c0b8e429443150ef4b58fc654ef6087f90e03 DIFF: https://github.com/llvm/llvm-project/commit/704c0b8e429443150ef4b58fc654ef6087f90e03.diff LOG: Revert "[flang][runtime][NFC] Allow different memmove function in assign (#11…" This reverts commit b278fe3297557c8db492e2d90b4ea9fe683fa479. Added: Modified: flang/include/flang/Runtime/assign.h flang/runtime/assign.cpp Removed: ################################################################################ diff --git a/flang/include/flang/Runtime/assign.h b/flang/include/flang/Runtime/assign.h index 331ec0516dd2d5..a1cc9eaf4355f6 100644 --- a/flang/include/flang/Runtime/assign.h +++ b/flang/include/flang/Runtime/assign.h @@ -24,35 +24,11 @@ #define FORTRAN_RUNTIME_ASSIGN_H_ #include "flang/Runtime/entry-names.h" -#include "flang/Runtime/freestanding-tools.h" namespace Fortran::runtime { class Descriptor; -class Terminator; - -enum AssignFlags { - NoAssignFlags = 0, - MaybeReallocate = 1 << 0, - NeedFinalization = 1 << 1, - CanBeDefinedAssignment = 1 << 2, - ComponentCanBeDefinedAssignment = 1 << 3, - ExplicitLengthCharacterLHS = 1 << 4, - PolymorphicLHS = 1 << 5, - DeallocateLHS = 1 << 6 -}; - -using MemmoveFct = void *(*)(void *, const void *, std::size_t); - -static RT_API_ATTRS void *MemmoveWrapper( - void *dest, const void *src, std::size_t count) { - return Fortran::runtime::memmove(dest, src, count); -} - -RT_API_ATTRS void Assign(Descriptor &to, const Descriptor &from, - Terminator &terminator, int flags, MemmoveFct memmoveFct = &MemmoveWrapper); extern "C" { - // API for lowering assignment void RTDECL(Assign)(Descriptor &to, const Descriptor &from, const char *sourceFile = nullptr, int sourceLine = 0); diff --git a/flang/runtime/assign.cpp b/flang/runtime/assign.cpp index 8f31fc4d127168..d558ada51cd21a 100644 --- a/flang/runtime/assign.cpp +++ b/flang/runtime/assign.cpp @@ -17,6 +17,17 @@ namespace Fortran::runtime { +enum AssignFlags { + NoAssignFlags = 0, + MaybeReallocate = 1 << 0, + NeedFinalization = 1 << 1, + CanBeDefinedAssignment = 1 << 2, + ComponentCanBeDefinedAssignment = 1 << 3, + ExplicitLengthCharacterLHS = 1 << 4, + PolymorphicLHS = 1 << 5, + DeallocateLHS = 1 << 6 +}; + // Predicate: is the left-hand side of an assignment an allocated allocatable // that must be deallocated? static inline RT_API_ATTRS bool MustDeallocateLHS( @@ -239,8 +250,8 @@ static RT_API_ATTRS void BlankPadCharacterAssignment(Descriptor &to, // of elements, but their shape need not to conform (the assignment is done in // element sequence order). This facilitates some internal usages, like when // dealing with array constructors. -RT_API_ATTRS void Assign(Descriptor &to, const Descriptor &from, - Terminator &terminator, int flags, MemmoveFct memmoveFct) { +RT_API_ATTRS static void Assign( + Descriptor &to, const Descriptor &from, Terminator &terminator, int flags) { bool mustDeallocateLHS{(flags & DeallocateLHS) || MustDeallocateLHS(to, from, terminator, flags)}; DescriptorAddendum *toAddendum{to.Addendum()}; @@ -412,14 +423,14 @@ RT_API_ATTRS void Assign(Descriptor &to, const Descriptor &from, Assign(toCompDesc, fromCompDesc, terminator, nestedFlags); } else { // Component has intrinsic type; simply copy raw bytes std::size_t componentByteSize{comp.SizeInBytes(to)}; - memmoveFct(to.Element<char>(toAt) + comp.offset(), + Fortran::runtime::memmove(to.Element<char>(toAt) + comp.offset(), from.Element<const char>(fromAt) + comp.offset(), componentByteSize); } break; case typeInfo::Component::Genre::Pointer: { std::size_t componentByteSize{comp.SizeInBytes(to)}; - memmoveFct(to.Element<char>(toAt) + comp.offset(), + Fortran::runtime::memmove(to.Element<char>(toAt) + comp.offset(), from.Element<const char>(fromAt) + comp.offset(), componentByteSize); } break; @@ -465,14 +476,14 @@ RT_API_ATTRS void Assign(Descriptor &to, const Descriptor &from, const auto &procPtr{ *procPtrDesc.ZeroBasedIndexedElement<typeInfo::ProcPtrComponent>( k)}; - memmoveFct(to.Element<char>(toAt) + procPtr.offset, + Fortran::runtime::memmove(to.Element<char>(toAt) + procPtr.offset, from.Element<const char>(fromAt) + procPtr.offset, sizeof(typeInfo::ProcedurePointer)); } } } else { // intrinsic type, intrinsic assignment if (isSimpleMemmove()) { - memmoveFct(to.raw().base_addr, from.raw().base_addr, + Fortran::runtime::memmove(to.raw().base_addr, from.raw().base_addr, toElements * toElementBytes); } else if (toElementBytes > fromElementBytes) { // blank padding switch (to.type().raw()) { @@ -496,8 +507,8 @@ RT_API_ATTRS void Assign(Descriptor &to, const Descriptor &from, } else { // elemental copies, possibly with character truncation for (std::size_t n{toElements}; n-- > 0; to.IncrementSubscripts(toAt), from.IncrementSubscripts(fromAt)) { - memmoveFct(to.Element<char>(toAt), from.Element<const char>(fromAt), - toElementBytes); + Fortran::runtime::memmove(to.Element<char>(toAt), + from.Element<const char>(fromAt), toElementBytes); } } } _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
