Skip to content

Fixed a bug in "literal math" for shift operators. If the RHS value i… #10166

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

Merged
erictraut merged 1 commit into from
Mar 25, 2025
+22 −3
Merged

Fixed a bug in "literal math" for shift operators. If the RHS value i… #10166

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
13 changes: 10 additions & 3 deletions packages/pyright-internal/src/analyzer/operations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,7 +1037,10 @@ function calcLiteralForBinaryOp(operator: OperatorType, leftType: Type, rightTyp
// infinity, so we need to adjust the result if the signs
// of the operands are different.
if (leftLiteralValue !== rightLiteralValue && leftLiteralValue !== BigInt(0)) {
if (leftLiteralValue < BigInt(0) !== rightLiteralValue < BigInt(0)) {
if (
leftLiteralValue < BigInt(0) !== rightLiteralValue < BigInt(0) &&
leftLiteralValue !== rightLiteralValue * BigInt(-1)
) {
newValue -= BigInt(1);
}
}
Expand All @@ -1055,9 +1058,13 @@ function calcLiteralForBinaryOp(operator: OperatorType, leftType: Type, rightTyp
}
}
} else if (operator === OperatorType.LeftShift) {
newValue = leftLiteralValue << rightLiteralValue;
if (rightLiteralValue >= BigInt(0)) {
newValue = leftLiteralValue << rightLiteralValue;
}
} else if (operator === OperatorType.RightShift) {
newValue = leftLiteralValue >> rightLiteralValue;
if (rightLiteralValue >= BigInt(0)) {
newValue = leftLiteralValue >> rightLiteralValue;
}
} else if (operator === OperatorType.BitwiseAnd) {
newValue = leftLiteralValue & rightLiteralValue;
} else if (operator === OperatorType.BitwiseOr) {
Expand Down
12 changes: 12 additions & 0 deletions packages/pyright-internal/src/tests/samples/operator8.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,18 @@ def func1(a: Literal[1, 2], b: Literal[0, 4], c: Literal[3, 4]):
c10 = 0 // 6
reveal_type(c10, expected_text="Literal[0]")

c11 = -6 // 6
reveal_type(c11, expected_text="Literal[-1]")

c12 = 6 // -6
reveal_type(c12, expected_text="Literal[-1]")

c13 = 1 << -1
reveal_type(c13, expected_text="int")

c14 = 1 >> -1
reveal_type(c14, expected_text="int")


def func2(cond: bool):
c1 = "Hi " + ("Steve" if cond else "Amy")
Expand Down