Skip to content

[Eval] Use user compiler type for arithmetic operations #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dil-main
Choose a base branch
from
Open

[Eval] Use user compiler type for arithmetic operations #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions lldb/source/ValueObject/DILEval.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1812,7 +1812,7 @@ Interpreter::EvaluateBinaryAddition(lldb::ValueObjectSP lhs,
assert(lhs->GetCompilerType().CompareTypes(rhs->GetCompilerType()) &&
"invalid ast: operand must have the same type");
return EvaluateArithmeticOp(m_target, BinaryOpKind::Add, lhs, rhs,
lhs->GetCompilerType().GetCanonicalType());
lhs->GetCompilerType());
}

// Here one of the operands must be a pointer and the other one an integer.
Expand Down Expand Up @@ -1847,7 +1847,7 @@ Interpreter::EvaluateBinarySubtraction(lldb::ValueObjectSP lhs,
assert(lhs->GetCompilerType().CompareTypes(rhs->GetCompilerType()) &&
"invalid ast: operand must have the same type");
return EvaluateArithmeticOp(m_target, BinaryOpKind::Sub, lhs, rhs,
lhs->GetCompilerType().GetCanonicalType());
lhs->GetCompilerType());
}
assert(lhs->GetCompilerType().IsPointerType()
&& "invalid ast: lhs must be a pointer");
Expand Down Expand Up @@ -1907,7 +1907,7 @@ Interpreter::EvaluateBinaryMultiplication(lldb::ValueObjectSP lhs,
"invalid ast: operands must be arithmetic and have the same type");

return EvaluateArithmeticOp(m_target, BinaryOpKind::Mul, lhs, rhs,
lhs->GetCompilerType().GetCanonicalType());
lhs->GetCompilerType());
}

llvm::Expected<lldb::ValueObjectSP>
Expand All @@ -1934,7 +1934,7 @@ Interpreter::EvaluateBinaryDivision(lldb::ValueObjectSP lhs,
}

return EvaluateArithmeticOp(m_target, BinaryOpKind::Div, lhs, rhs,
lhs->GetCompilerType().GetCanonicalType());
lhs->GetCompilerType());
}

llvm::Expected<lldb::ValueObjectSP>
Expand Down Expand Up @@ -1973,7 +1973,7 @@ Interpreter::EvaluateBinaryBitwise(BinaryOpKind kind, lldb::ValueObjectSP lhs,
"invalid ast: operation must be '&', '|' or '^'");

return EvaluateArithmeticOpInteger(m_target, kind, lhs, rhs,
lhs->GetCompilerType().GetCanonicalType());
lhs->GetCompilerType());
}

llvm::Expected<lldb::ValueObjectSP>
Expand Down
6 changes: 3 additions & 3 deletions lldb/unittests/DIL/DILTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ TEST_F(EvalTest, TestBitwiseOperators) {
EXPECT_THAT(Eval("(signed char)-123 >> 8"), IsEqual("-1"));

EXPECT_THAT(Eval("0b1011 & 0xFF"), IsEqual("11"));
EXPECT_THAT(Eval("0b1011 & mask_ff"), XFail(IsEqual("11")));
EXPECT_THAT(Eval("0b1011 & mask_ff"), IsEqual("11"));
EXPECT_THAT(Eval("0b1011 & 0b0111"), IsEqual("3"));
EXPECT_THAT(Eval("0b1011 | 0b0111"), IsEqual("15"));
EXPECT_THAT(Eval("-0b1011 | 0xFF"), IsEqual("-1"));
Expand Down Expand Up @@ -2237,7 +2237,7 @@ TEST_F(EvalTest, TestBitFieldPromotion) {
EXPECT_THAT(Eval("bf.f - 2"), IsEqual("4294967295"));
EXPECT_THAT(Eval("bf.g - 2"), IsEqual("-1"));
EXPECT_THAT(Eval("bf.h - 2"), IsEqual("-1"));
EXPECT_THAT(Eval("bf.i - 2"), XFail(IsEqual("18446744073709551615")));
EXPECT_THAT(Eval("bf.i - 2"), IsEqual("18446744073709551615"));
EXPECT_THAT(Eval("bf.g - bf.b"), IsEqual("-8"));

EXPECT_THAT(Eval("-(true ? bf.b : bf.a)"), IsEqual("-9"));
Expand All @@ -2247,7 +2247,7 @@ TEST_F(EvalTest, TestBitFieldPromotion) {
EXPECT_THAT(Eval("-(true ? bf.b : bf.h)"), IsEqual("-9"));

if (HAS_METHOD(lldb::SBType, GetEnumerationIntegerType())) {
EXPECT_THAT(Eval("bf.j - 2"), XFail(IsEqual("4294967295")));
EXPECT_THAT(Eval("bf.j - 2"), IsEqual("4294967295"));
EXPECT_THAT(Eval("-(true ? bf.b : bf.j)"), IsEqual("4294967287"));
EXPECT_THAT(Eval("-(true ? bf.e : bf.j)"), IsEqual("4294967295"));
}
Expand Down