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/system_tests/ESMF_ConcurrentEnsemble/user_modelA.F90

@@ -201,18 +201,21 @@ subroutine user_final(comp, importState, exportState, clock, rc)
     type(ESMF_State) :: importState, exportState
     type(ESMF_Clock) :: clock
     integer, intent(out) :: rc
-    type(dataWrapper)   :: intStatePtr
 
     ! Local variables
-    type(ESMF_DistGrid) :: distgrid
-    type(ESMF_Array) :: array
+    type(dataWrapper)     :: intStatePtr
+    type(dblock), pointer :: p
+    type(ESMF_DistGrid)   :: distgrid
+    type(ESMF_Array)      :: array
 
     ! Initialize return code
     rc = ESMF_SUCCESS
 
     call ESMF_GridCompGetInternalState(comp, intStatePtr, rc)
     if (rc/=ESMF_SUCCESS) return ! bail out
-    deallocate(intStatePtr%p)
+
+    p => intStatePtr%p  ! LLVM workaround for deallocate() runtime error!
+    deallocate(p)
 
     call ESMF_StateGet(exportState, "array data", array, rc=rc)
     if (rc/=ESMF_SUCCESS) return ! bail out

src/system_tests/ESMF_ConcurrentEnsemble/user_modelB.F90

@@ -205,18 +205,21 @@ subroutine user_final(comp, importState, exportState, clock, rc)
     type(ESMF_State) :: importState, exportState
     type(ESMF_Clock) :: clock
     integer, intent(out) :: rc
-    type(dataWrapper)   :: intStatePtr
 
     ! Local variables
-    type(ESMF_DistGrid) :: distgrid
-    type(ESMF_Array) :: array
+    type(dataWrapper)     :: intStatePtr
+    type(dblock), pointer :: p
+    type(ESMF_DistGrid)   :: distgrid
+    type(ESMF_Array)      :: array
 
     ! Initialize return code
     rc = ESMF_SUCCESS
 
     call ESMF_GridCompGetInternalState(comp, intStatePtr, rc)
     if (rc/=ESMF_SUCCESS) return ! bail out
-    deallocate(intStatePtr%p)
+
+    p => intStatePtr%p  ! LLVM workaround for deallocate() runtime error!
+    deallocate(p)
 
     call ESMF_StateGet(exportState, "array data", array, rc=rc)
     if (rc/=ESMF_SUCCESS) return ! bail out

src/system_tests/ESMF_SequentialEnsemble/user_modelA.F90

@@ -201,18 +201,21 @@ subroutine user_final(comp, importState, exportState, clock, rc)
     type(ESMF_State) :: importState, exportState
     type(ESMF_Clock) :: clock
     integer, intent(out) :: rc
-    type(dataWrapper)   :: intStatePtr
 
     ! Local variables
-    type(ESMF_DistGrid) :: distgrid
-    type(ESMF_Array) :: array
+    type(dataWrapper)     :: intStatePtr
+    type(dblock), pointer :: p
+    type(ESMF_DistGrid)   :: distgrid
+    type(ESMF_Array)      :: array
 
     ! Initialize return code
     rc = ESMF_SUCCESS
 
     call ESMF_GridCompGetInternalState(comp, intStatePtr, rc)
     if (rc/=ESMF_SUCCESS) return ! bail out
-    deallocate(intStatePtr%p)
+
+    p => intStatePtr%p  ! LLVM workaround for deallocate() runtime error!
+    deallocate(p)
 
     call ESMF_StateGet(exportState, "array data", array, rc=rc)
     if (rc/=ESMF_SUCCESS) return ! bail out

src/system_tests/ESMF_SequentialEnsemble/user_modelB.F90

@@ -205,18 +205,21 @@ subroutine user_final(comp, importState, exportState, clock, rc)
     type(ESMF_State) :: importState, exportState
     type(ESMF_Clock) :: clock
     integer, intent(out) :: rc
-    type(dataWrapper)   :: intStatePtr
 
     ! Local variables
-    type(ESMF_DistGrid) :: distgrid
-    type(ESMF_Array) :: array
+    type(dataWrapper)     :: intStatePtr
+    type(dblock), pointer :: p
+    type(ESMF_DistGrid)   :: distgrid
+    type(ESMF_Array)      :: array
 
     ! Initialize return code
     rc = ESMF_SUCCESS
 
     call ESMF_GridCompGetInternalState(comp, intStatePtr, rc)
     if (rc/=ESMF_SUCCESS) return ! bail out
-    deallocate(intStatePtr%p)
+
+    p => intStatePtr%p  ! LLVM workaround for deallocate() runtime error!
+    deallocate(p)
 
     call ESMF_StateGet(exportState, "array data", array, rc=rc)
     if (rc/=ESMF_SUCCESS) return ! bail out