Fix math.bitShiftRight for negative int (#983)

* Fix math.bitShiftRight for negative int Signed-off-by: Justin King <[email protected]> * Update ext/math_test.go Signed-off-by: Justin King <[email protected]> --------- Signed-off-by: Justin King <[email protected]>
google · Jul 19, 2024 · bc96f3b · bc96f3b
1 parent 21976cf
commit bc96f3b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -119,7 +119,7 @@ go_repository(
 # CEL Spec deps
 go_repository(
     name = "com_google_cel_spec",
-    commit = "8958834564cfc6a4764f76238d03cdbe772665bb",
+    commit = "5299974f1c69103e4bb4eec48f7d9b24413ca3c7",
     importpath = "github.com/google/cel-spec",
 )
 

diff --git a/ext/math.go b/ext/math.go
@@ -755,7 +755,7 @@ func bitShiftRightIntInt(value, bits ref.Val) ref.Val {
 	if bs < types.IntZero {
 		return types.NewErr("math.bitShiftRight() negative offset: %d", bs)
 	}
-	return v >> bs
+	return types.Int(types.Uint(v) >> bs)
 }
 
 func bitShiftRightUintInt(value, bits ref.Val) ref.Val {

diff --git a/ext/math_test.go b/ext/math_test.go
@@ -129,8 +129,8 @@ func TestMath(t *testing.T) {
 		{expr: "math.bitShiftLeft(-1, 200) == 0"},
 		{expr: "math.bitShiftRight(1024, 2) == 256"},
 		{expr: "math.bitShiftRight(1024, 64) == 0"},
-		{expr: "math.bitShiftRight(-1024, 3) == -128"},
-		{expr: "math.bitShiftRight(-1024, 64) == -1"},
+		{expr: "math.bitShiftRight(-1024, 3) == 2305843009213693824"},
+		{expr: "math.bitShiftRight(-1024, 64) == 0"},
 		// Unsigned bitwise ops
 		{expr: "math.bitAnd(1u, 2u) == 0u"},
 		{expr: "math.bitAnd(1u, 3u) == 1u"},