More places for the LLVM workaround when dealing with Fortran pointers

inside Fortran derived types that are handed through the C/C++ layer.

Author: theurich

src/Infrastructure/Container/tests/ESMF_ContainerUTest.F90

@@ -81,7 +81,8 @@ program ESMF_ContainerUTest
   integer                         :: garbageCount, itemCount
   logical                         :: isPresent, loopResult
   type(TestType)                  :: tt
-  
+  type(TestTypeStruct), pointer   :: wrap
+
 !-------------------------------------------------------------------------------
 ! The unit tests are divided into Sanity and Exhaustive. The Sanity tests are
 ! always run. When the environment variable, EXHAUSTIVE, is set to ON then 
@@ -1100,7 +1101,8 @@ program ESMF_ContainerUTest
       loopResult = .false.
       exit
     endif
-    deallocate(tt%wrap, stat=stat)
+    wrap => tt%wrap ! LLVM workaround for deallocate() runtime error!
+    deallocate(wrap, stat=stat)
     if (stat/=0) then
       loopResult = .false.
       exit

src/Superstructure/InternalState/examples/ESMF_InternalStateEx.F90

@@ -54,6 +54,7 @@ program ESMF_InternalStateEx
   end type
 
   type(dataWrapper)             :: wrap
+  type(testData), pointer       :: p
   character(len=:), allocatable :: labelList(:)
 !EOC
   integer :: result
@@ -129,7 +130,8 @@ program ESMF_InternalStateEx
   endif
 
   ! Deallocate the private data block
-  deallocate(wrap%p)
+  p => wrap%p  ! LLVM workaround for deallocate() runtime error!
+  deallocate(p)
 
 !EOC
 !-------------------------------------------------------------------------
@@ -192,15 +194,17 @@ program ESMF_InternalStateEx
   if (rc .ne. ESMF_SUCCESS) finalrc = ESMF_FAILURE
 
   ! Deallocate the private data block
-  deallocate(wrap%p)
+  p => wrap%p  ! LLVM workaround for deallocate() runtime error!
+  deallocate(p)
 
   ! Get Internal State
   call ESMF_InternalStateGet(comp, internalState=wrap, &
     label="second named data block", rc=rc)
   if (rc .ne. ESMF_SUCCESS) finalrc = ESMF_FAILURE
 
   ! Deallocate the private data block
-  deallocate(wrap%p)
+  p => wrap%p  ! LLVM workaround for deallocate() runtime error!
+  deallocate(p)
 
 !EOC
 

src/Superstructure/InternalState/tests/ESMF_InternalStateUTest.F90

@@ -55,6 +55,7 @@ program ESMF_InternalStateUTest
     end type
 
     type(dataWrapper)             :: wrapAdd, wrapGet
+    type(testData), pointer       :: p
     character(len=:), allocatable :: labelList(:)
     logical                       :: isValid
 
@@ -232,7 +233,8 @@ program ESMF_InternalStateUTest
     call ESMF_Test((isValid), name, failMsg, result, ESMF_SRCLINE)
 
     ! deallocate InternalState data
-    deallocate(wrapGet%p)
+    p => wrapGet%p  ! LLVM workaround for deallocate() runtime error!
+    deallocate(p)
 
     !------------------------------------------------------------------------
     !NEX_UTest
@@ -250,7 +252,8 @@ program ESMF_InternalStateUTest
     call ESMF_Test((isValid), name, failMsg, result, ESMF_SRCLINE)
 
     ! deallocate InternalState data
-    deallocate(wrapGet%p)
+    p => wrapGet%p  ! LLVM workaround for deallocate() runtime error!
+    deallocate(p)
 
     !------------------------------------------------------------------------
     !NEX_UTest
@@ -268,7 +271,8 @@ program ESMF_InternalStateUTest
     call ESMF_Test((isValid), name, failMsg, result, ESMF_SRCLINE)
 
     ! deallocate InternalState data
-    deallocate(wrapGet%p)
+    p => wrapGet%p  ! LLVM workaround for deallocate() runtime error!
+    deallocate(p)
 
     !------------------------------------------------------------------------
     !NEX_UTest