intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-02-09 01:52:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

[flang][runtime] Ensure PointerDeallocate actually deallocate pointers

Browse Source 
PointerDeallocate was silently doing nothing because it relied on
Destroy that doe not do anything for Pointers. Add an option to Destroy
in order to destroy pointers.

Add a unit test for PointerDeallocate.

Differential Revision: https://reviews.llvm.org/D122492
This commit is contained in:
Jean Perier
2022-03-28 10:21:36 +02:00
parent c0eb9b4cde
commit 479eed1850
5 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flang/include/flang/Runtime/descriptor.h
View File

@@ -347,7 +347,7 @@ public:
// Deallocates storage, including allocatable and automatic
// components. Optionally invokes FINAL subroutines.
int Destroy(bool finalize = false);
int Destroy(bool finalize = false, bool destroyPointers = false);
bool IsContiguous(int leadingDimensions = maxRank) const {
auto bytes{static_cast<SubscriptValue>(ElementBytes())};

4
flang/runtime/descriptor.cpp
View File

@@ -146,8 +146,8 @@ int Descriptor::Allocate() {
return 0;
}
int Descriptor::Destroy(bool finalize) {
if (raw_.attribute == CFI_attribute_pointer) {
int Descriptor::Destroy(bool finalize, bool destroyPointers) {
if (!destroyPointers && raw_.attribute == CFI_attribute_pointer) {
return StatOk;
} else {
if (auto *addendum{Addendum()}) {

2
flang/runtime/pointer.cpp
View File

@@ -141,7 +141,7 @@ int RTNAME(PointerDeallocate)(Descriptor &pointer, bool hasStat,
if (!pointer.IsAllocated()) {
return ReturnError(terminator, StatBaseNull, errMsg, hasStat);
}
return ReturnError(terminator, pointer.Destroy(true), errMsg, hasStat);
return ReturnError(terminator, pointer.Destroy(true, true), errMsg, hasStat);
}
bool RTNAME(PointerIsAssociated)(const Descriptor &pointer) {

1
flang/unittests/Runtime/CMakeLists.txt
View File

@@ -12,6 +12,7 @@ add_flang_unittest(FlangRuntimeTests
Namelist.cpp
Numeric.cpp
NumericalFormatTest.cpp
Pointer.cpp
Ragged.cpp
Random.cpp
Reduction.cpp

32
flang/unittests/Runtime/Pointer.cpp Normal file
View File

@@ -0,0 +1,32 @@
//===-- flang/unittests/Runtime/Pointer.cpp--------- -------------*- C++-*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
#include "flang/Runtime/pointer.h"
#include "gtest/gtest.h"
#include "tools.h"
#include "flang/Runtime/descriptor.h"
using namespace Fortran::runtime;
TEST(Pointer, BasicAllocateDeallocate) {
// REAL(4), POINTER :: p(:)
auto p{Descriptor::Create(TypeCode{Fortran::common::TypeCategory::Real, 4}, 4,
nullptr, 1, nullptr, CFI_attribute_pointer)};
// ALLOCATE(p(2:11))
RTNAME(PointerSetBounds)(*p, 0, 2, 11);
RTNAME(PointerAllocate)
(*p, /*hasStat=*/false, /*errMsg=*/nullptr, __FILE__, __LINE__);
EXPECT_TRUE(RTNAME(PointerIsAssociated)(*p));
EXPECT_EQ(p->Elements(), 10u);
EXPECT_EQ(p->GetDimension(0).LowerBound(), 2);
EXPECT_EQ(p->GetDimension(0).UpperBound(), 11);
// DEALLOCATE(p)
RTNAME(PointerDeallocate)
(*p, /*hasStat=*/false, /*errMsg=*/nullptr, __FILE__, __LINE__);
EXPECT_FALSE(RTNAME(PointerIsAssociated)(*p));
}