[flang-commits] [flang] 13e08de - [flang] Two tweaks to mollify buildbots

[peter klausler via flang-commits]

Author: peter klausler
Date: 2021-07-20T19:42:05-07:00
New Revision: 13e08de91da64ce969b14a0caa46dc4712bcf388

URL: https://github.com/llvm/llvm-project/commit/13e08de91da64ce969b14a0caa46dc4712bcf388
DIFF: https://github.com/llvm/llvm-project/commit/13e08de91da64ce969b14a0caa46dc4712bcf388.diff

LOG: [flang] Two tweaks to mollify buildbots

One test's expected output needs adjustment, and one new compiler
warning needs to be silenced.

Added: 
    

Modified: 
    flang/runtime/type-info.cpp
    flang/test/Semantics/offsets01.f90

Removed: 
    


################################################################################
diff  --git a/flang/runtime/type-info.cpp b/flang/runtime/type-info.cpp
index 0268a204a982a..f731182f17838 100644
--- a/flang/runtime/type-info.cpp
+++ b/flang/runtime/type-info.cpp
@@ -271,7 +271,8 @@ FILE *Component::Dump(FILE *f) const {
   std::fprintf(f, " category %d  kind %d  rank %d  offset 0x%zx\n", category_,
       kind_, rank_, static_cast<std::size_t>(offset_));
   if (initialization_) {
-    std::fprintf(f, " initialization @ 0x%p:\n", initialization_);
+    std::fprintf(f, " initialization @ 0x%p:\n",
+        reinterpret_cast<const void *>(initialization_));
     for (int j{0}; j < 128; j += sizeof(std::uint64_t)) {
       std::fprintf(f, " [%3d] 0x%016jx\n", j,
           static_cast<std::uintmax_t>(

diff  --git a/flang/test/Semantics/offsets01.f90 b/flang/test/Semantics/offsets01.f90
index 50974876e8d96..c3d66a5bc94ab 100644
--- a/flang/test/Semantics/offsets01.f90
+++ b/flang/test/Semantics/offsets01.f90
@@ -47,8 +47,8 @@ subroutine s5(n)
     integer, len :: l2
     real :: b(l1, l2)
   end type
-  type(t1(n))   :: x1 !CHECK: x1 size=48 offset=
-  type(t2(n,n)) :: x2 !CHECK: x2 size=56 offset=
+  type(t1(n))   :: x1 !CHECK: x1 size=40 offset=
+  type(t2(n,n)) :: x2 !CHECK: x2 size=48 offset=
   !CHECK: a size=48 offset=0:
   !CHECK: b size=72 offset=0:
 end