Skip to content

fix: mask left shifts in numeric fast path #1096

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
He-Pin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: mask left shifts in numeric fast path #1096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34e2b63
fix: mask left shifts in numeric fast path
He-Pin Jul 29, 2026
41f7ec3
test: add negative operand cases for left shift fast path
He-Pin Jul 29, 2026
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 sjsonnet/src/sjsonnet/Evaluator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,9 +894,10 @@ class Evaluator(
val ll = visitExprAsDouble(e.lhs).toSafeLong(pos)
val rr = visitExprAsDouble(e.rhs).toSafeLong(pos)
if (rr < 0) Error.fail("Shift by negative exponent", pos)
if (rr >= 1 && math.abs(ll) >= (1L << (63 - rr)))
val masked = (rr % 64).toInt
if (masked >= 1 && math.abs(ll) >= (1L << (63 - masked)))
Error.fail("Numeric value outside safe integer range for bitwise operation", pos)
(ll << rr).toDouble
(ll << masked).toDouble
case Expr.BinaryOp.OP_>> =>
val ll = visitExprAsDouble(e.lhs).toSafeLong(pos)
val rr = visitExprAsDouble(e.rhs).toSafeLong(pos)
Expand Down
9 changes: 9 additions & 0 deletions sjsonnet/test/resources/new_test_suite/leftshift_fast_path_masking.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
std.assertEqual((1 << 64) * 1, 1) &&
std.assertEqual(((1 << 64) + 0) * 1, 1) &&
std.assertEqual((1 << 65) * 1, 2) &&
std.assertEqual((1 << 128) * 1, 1) &&
std.assertEqual((0 << 128) * 1, 0) &&
std.assertEqual(((-1) << 64) * 1, -1) &&
std.assertEqual(((-2) << 65) * 1, -4) &&
std.assertEqual(((-3) << 128) * 1, -3) &&
true
1 change: 1 addition & 0 deletions sjsonnet/test/resources/new_test_suite/leftshift_fast_path_masking.jsonnet.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
true
Loading