summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Michael Berris <dberris@google.com>2018-05-14 03:55:12 +0000
committerDean Michael Berris <dberris@google.com>2018-05-14 03:55:12 +0000
commit845fe8a7087c68d8e88ac41229efa12c390d1491 (patch)
treeb23924ba72d832e1cc4066029abb0bc21dd44069
parenta2a0e1f3535e8166aa36025389549cb000d92a78 (diff)
downloadbcm5719-llvm-845fe8a7087c68d8e88ac41229efa12c390d1491.tar.gz
bcm5719-llvm-845fe8a7087c68d8e88ac41229efa12c390d1491.zip
[XRay][compiler-rt] Fixup: Avoid C++11 narrowing in non-x86_64
This should fix non-x86_64 builds where size_t != atomic_uint64_t::Type. Follow-up to D46574. llvm-svn: 332209
-rw-r--r--compiler-rt/lib/xray/xray_fdr_logging.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/compiler-rt/lib/xray/xray_fdr_logging.cc b/compiler-rt/lib/xray/xray_fdr_logging.cc
index 14326b5d2ba..ca50cf42d9e 100644
--- a/compiler-rt/lib/xray/xray_fdr_logging.cc
+++ b/compiler-rt/lib/xray/xray_fdr_logging.cc
@@ -123,9 +123,10 @@ XRayBuffer fdrIterator(const XRayBuffer B) {
if (It == End)
return {nullptr, 0};
- XRayBuffer Result{
- It->Data, __sanitizer::atomic_load(&It->Extents->Size,
- __sanitizer::memory_order_acquire)};
+ XRayBuffer Result;
+ Result.Data = It->Data;
+ Result.Size = __sanitizer::atomic_load(&It->Extents->Size,
+ __sanitizer::memory_order_acquire);
++It;
return Result;
}
OpenPOWER on IntegriCloud