Revert "Only pass the descriptor arg to CFI_show()"

This reverts commit 9994293.

Author: eugeneepshteyn

flang-rt/lib/runtime/ISO_Fortran_binding.cpp

@@ -297,9 +297,11 @@ RT_API_ATTRS int CFI_setpointer(CFI_cdesc_t *result, const CFI_cdesc_t *source,
   return CFI_SUCCESS;
 }
 
-RT_API_ATTRS void CFI_show(const CFI_cdesc_t *descr) {
+RT_API_ATTRS void CFI_show(void *buf, const CFI_cdesc_t *descr) {
+  FILE *f{stderr};
+  std::fprintf(f, "%p CFI_desc_t: %p\n", buf, descr);
   if (descr) {
-    reinterpret_cast<const Fortran::runtime::Descriptor *>(descr)->Dump(stderr);
+    reinterpret_cast<const Fortran::runtime::Descriptor *>(descr)->Dump(f);
   }
 }
 

flang/include/flang/ISO_Fortran_binding.h

@@ -208,7 +208,7 @@ RT_API_ATTRS int CFI_select_part(CFI_cdesc_t *, const CFI_cdesc_t *source,
     size_t displacement, size_t elem_len);
 RT_API_ATTRS int CFI_setpointer(
     CFI_cdesc_t *, const CFI_cdesc_t *source, const CFI_index_t lower_bounds[]);
-RT_API_ATTRS void CFI_show(const CFI_cdesc_t *descr);
+RT_API_ATTRS void CFI_show(void *buf, const CFI_cdesc_t *descr);
 #ifdef __cplusplus
 } // extern "C"
 #endif