Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lldb/source/Utility/Scalar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -565,12 +565,13 @@ const Scalar lldb_private::operator-(Scalar lhs, Scalar rhs) {

const Scalar lldb_private::operator/(Scalar lhs, Scalar rhs) {
Scalar result;
if ((result.m_type = Scalar::PromoteToMaxType(lhs, rhs)) != Scalar::e_void &&
!rhs.IsZero()) {
if ((result.m_type = Scalar::PromoteToMaxType(lhs, rhs)) != Scalar::e_void) {
switch (result.m_type) {
case Scalar::e_void:
break;
case Scalar::e_int:
if (rhs.IsZero())
break;
result.m_integer = lhs.m_integer / rhs.m_integer;
return result;
case Scalar::e_float:
Expand Down
6 changes: 6 additions & 0 deletions lldb/unittests/Utility/ScalarTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,12 @@ TEST(ScalarTest, Division) {
Scalar r = lhs / rhs;
EXPECT_TRUE(r.IsValid());
EXPECT_EQ(r, Scalar(2.5));

Scalar inf = Scalar(1) / Scalar(0.0f);
Scalar int0 = Scalar(1) / Scalar(0);
Scalar ref_inf = llvm::APFloat::getInf(llvm::APFloat::IEEEsingle());
EXPECT_EQ(inf, ref_inf);
EXPECT_FALSE(int0.IsValid());
}

TEST(ScalarTest, Promotion) {
Expand Down
Loading