From 13e08de91da64ce969b14a0caa46dc4712bcf388 Mon Sep 17 00:00:00 2001 From: peter klausler Date: Tue, 20 Jul 2021 19:40:43 -0700 Subject: [PATCH] [flang] Two tweaks to mollify buildbots One test's expected output needs adjustment, and one new compiler warning needs to be silenced. --- flang/runtime/type-info.cpp | 3 ++- flang/test/Semantics/offsets01.f90 | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/flang/runtime/type-info.cpp b/flang/runtime/type-info.cpp index 0268a204a982..f731182f1783 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(offset_)); if (initialization_) { - std::fprintf(f, " initialization @ 0x%p:\n", initialization_); + std::fprintf(f, " initialization @ 0x%p:\n", + reinterpret_cast(initialization_)); for (int j{0}; j < 128; j += sizeof(std::uint64_t)) { std::fprintf(f, " [%3d] 0x%016jx\n", j, static_cast( diff --git a/flang/test/Semantics/offsets01.f90 b/flang/test/Semantics/offsets01.f90 index 50974876e8d9..c3d66a5bc94a 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