<div dir="ltr"><div>+ Pavel for post-commit review.<br></div><div><br></div>I've reinstated the original behavior to fix the UBSan error on the bot. Please let me know if you prefer a different approach. </div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Jun 30, 2020 at 12:41 PM Jonas Devlieghere via lldb-commits <<a href="mailto:lldb-commits@lists.llvm.org">lldb-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex"><br>
Author: Jonas Devlieghere<br>
Date: 2020-06-30T12:41:41-07:00<br>
New Revision: 2501e86acda2905e50012f7e9fc1942517c1237d<br>
<br>
URL: <a href="https://github.com/llvm/llvm-project/commit/2501e86acda2905e50012f7e9fc1942517c1237d" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/2501e86acda2905e50012f7e9fc1942517c1237d</a><br>
DIFF: <a href="https://github.com/llvm/llvm-project/commit/2501e86acda2905e50012f7e9fc1942517c1237d.diff" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/2501e86acda2905e50012f7e9fc1942517c1237d.diff</a><br>
<br>
LOG: [lldb/Scalar] Fix undefined behavior<br>
<br>
Fix UBSan error detected in TestDataFormatterObjCCF.py and<br>
TestDataFormatterObjCNSDate.py:<br>
<br>
Scalar.cpp:698:27: runtime error: -4.96303e+08 is outside the range of<br>
representable values of type 'unsigned long long'.<br>
<br>
Added: <br>
<br>
<br>
Modified: <br>
    lldb/source/Utility/Scalar.cpp<br>
<br>
Removed: <br>
<br>
<br>
<br>
################################################################################<br>
diff  --git a/lldb/source/Utility/Scalar.cpp b/lldb/source/Utility/Scalar.cpp<br>
index 610c935409ac..d275f6211e5c 100644<br>
--- a/lldb/source/Utility/Scalar.cpp<br>
+++ b/lldb/source/Utility/Scalar.cpp<br>
@@ -736,7 +736,17 @@ long long Scalar::SLongLong(long long fail_value) const {<br>
 }<br>
<br>
 unsigned long long Scalar::ULongLong(unsigned long long fail_value) const {<br>
-  return GetAsUnsigned<unsigned long long>(fail_value);<br>
+  switch (m_type) {<br>
+  case e_double: {<br>
+    double d_val = m_float.convertToDouble();<br>
+    llvm::APInt rounded_double =<br>
+        llvm::APIntOps::RoundDoubleToAPInt(d_val, sizeof(ulonglong_t) * 8);<br>
+    return static_cast<ulonglong_t>(<br>
+        (rounded_double.zextOrTrunc(sizeof(ulonglong_t) * 8)).getZExtValue());<br>
+  }<br>
+  default:<br>
+    return GetAsUnsigned<unsigned long long>(fail_value);<br>
+  }<br>
 }<br>
<br>
 llvm::APInt Scalar::SInt128(const llvm::APInt &fail_value) const {<br>
<br>
<br>
<br>
_______________________________________________<br>
lldb-commits mailing list<br>
<a href="mailto:lldb-commits@lists.llvm.org" target="_blank">lldb-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits</a><br>
</blockquote></div>