azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix integer conversion on 32-bit

Browse Source
This commit is contained in:
Alexander Shabalin
2021-06-17 13:25:09 +03:00
committed by Space
parent eaed67df29
commit 91a852d3fd
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/runtime/src/main/cpp/MemoryUsageInfo.cpp
+6 -2
View File
@@ -58,6 +58,10 @@ size_t kotlin::GetPeakResidentSetSizeBytes() noexcept {
extern "C" RUNTIME_NOTHROW KLong Kotlin_MemoryUsageInfo_getPeakResidentSetSizeBytes() { extern "C" RUNTIME_NOTHROW KLong Kotlin_MemoryUsageInfo_getPeakResidentSetSizeBytes() {
auto result = kotlin::GetPeakResidentSetSizeBytes(); auto result = kotlin::GetPeakResidentSetSizeBytes();
auto boundedResult = std::min<decltype(result)>(result, std::numeric_limits<KLong>::max()); // TODO: Need a common implementation for such conversions.
return static_cast<KLong>(boundedResult); if constexpr (sizeof(decltype(result)) >= sizeof(KLong)) {
return static_cast<KLong>(std::min<decltype(result)>(result, std::numeric_limits<KLong>::max()));
} else {
return std::min<KLong>(result, std::numeric_limits<KLong>::max());
}
} }