BEGIN_PUBLIC
starlark: infinite precision ints
BEWARE: j.l.Integer is no longer a legal Starlark value.
This change makes the Starlark 'int' type a bigint,
aka infinite-precision integer, one capable of exact arithmetic
on any integer value. The new Int class has three subclasses,
similar to j.l.Integer, j.l.Long, and j.l.BigInteger.
The most compact representation is always used.
This makes Starlark capable of handling all the integer
types that occur in protocol messages---signed and unsigned
64-bit values.
Memory usage should not change much because StarlarkInt.Int32
has the same layout as the j.l.Integer it replaces.
As with j.l.Integer, small values (<100,000) are cached
to avoid unnecessary allocation.
Integer is no longer a legal Starlark value type. However,
for compatibility and convenience, parameters of
StarlarkMethod-annotated Java functions may continue to
use Integer to mean "32-bit signed int". The interpreter
does a "reboxing" operation to convert Int arguments
to Integer parameters as needed. Also, such functions may
return Integer values, and they will be reboxed by fromJava,
similar to List and Map. However, just as one cannot return
List and Map values nested inside Starlark data structures,
nor can one nest Integers in them; an explicit boxing operation
is required: StarlarkInt.of(x).
To limit the scope of this change, it does not yet add support
for parsing bigint literals. That will come in a follow-up.
Bazel: attr.int(..) rule attributes now use Int instead of
Integer. This is necessary because the assumption that Attribute
values are all legal Starlark values seems to be widely relied on.
However, int attributes remain restricted to the signed 32-bit
part of the value range. (Changing this would have much greater
ramifications for Bazel.) Every access of an int-valued rule
attribute must now call toIntUnchecked(), which cannot fail.
Suggested reading order:
- eval.StarlarkInt, the new type.
- the rest of eval, which does reboxing.
- trivial updates to tests of the interpreter.
(Most of these tests belong in testdata/*.star files.)
- lib.packages attribute changes.
- the rest, which is mostly trivial updates.
The most obvious downsides of this change are the loss of implicit
boxing, the potential for latent errors due to the lack of dynamic
checkValid calls in (e.g.) Dict.put, and the need to tell other Java
packages (such as the Gson JSON package) that Int is basically a
version of Integer, which it already knows about.
I have no doubt missed a few spots, and we may encounter a few
unhelpful "want int, got int" errors when an Integer value
sneaks into the Starlark value realm. I will fix them as they
arise.
Credit to Jon Brandvein for b/36358845#comment9. Before it, I
had resigned myself to this feature being infeasible in Starlark/Java.
END_PUBLIC
PiperOrigin-RevId: 334649352
diff --git a/src/test/java/com/google/devtools/build/docgen/RuleDocumentationAttributeTest.java b/src/test/java/com/google/devtools/build/docgen/RuleDocumentationAttributeTest.java
index c5a5667..76bb485 100644
--- a/src/test/java/com/google/devtools/build/docgen/RuleDocumentationAttributeTest.java
+++ b/src/test/java/com/google/devtools/build/docgen/RuleDocumentationAttributeTest.java
@@ -23,6 +23,7 @@
import com.google.devtools.build.lib.packages.BuildType;
import com.google.devtools.build.lib.packages.Type;
import com.google.devtools.build.lib.rules.cpp.CppFileTypes;
+import net.starlark.java.eval.StarlarkInt;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -116,7 +117,7 @@
@Test
public void testSynopsisForIntegerAttribute() {
- final int defaultValue = 384;
+ StarlarkInt defaultValue = StarlarkInt.of(384);
Attribute attribute = Attribute.attr("bar_limit", Type.INTEGER)
.value(defaultValue).build();
RuleDocumentationAttribute attributeDoc = RuleDocumentationAttribute.create(
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/StarlarkAttrTransitionProviderTest.java b/src/test/java/com/google/devtools/build/lib/analysis/StarlarkAttrTransitionProviderTest.java
index fce6873..70aa7e0 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/StarlarkAttrTransitionProviderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/StarlarkAttrTransitionProviderTest.java
@@ -46,6 +46,7 @@
import java.util.stream.Collectors;
import net.starlark.java.eval.Dict;
import net.starlark.java.eval.Starlark;
+import net.starlark.java.eval.StarlarkInt;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -1050,7 +1051,7 @@
.getOptions()
.getStarlarkOptions()
.get(Label.parseAbsoluteUnchecked("//test/starlark:the-answer")))
- .isEqualTo(42);
+ .isEqualTo(StarlarkInt.of(42));
}
@Test
@@ -1084,7 +1085,7 @@
.getOptions()
.getStarlarkOptions()
.get(Label.parseAbsoluteUnchecked("//test/starlark:the-answer")))
- .isEqualTo(42);
+ .isEqualTo(StarlarkInt.of(42));
}
private CoreOptions getCoreOptions(ConfiguredTarget target) {
diff --git a/src/test/java/com/google/devtools/build/lib/collect/nestedset/DepsetTest.java b/src/test/java/com/google/devtools/build/lib/collect/nestedset/DepsetTest.java
index 5ef6a39..9eacd9e 100644
--- a/src/test/java/com/google/devtools/build/lib/collect/nestedset/DepsetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/collect/nestedset/DepsetTest.java
@@ -22,6 +22,7 @@
import net.starlark.java.eval.Dict;
import net.starlark.java.eval.Sequence;
import net.starlark.java.eval.StarlarkCallable;
+import net.starlark.java.eval.StarlarkInt;
import net.starlark.java.eval.StarlarkIterable;
import net.starlark.java.eval.StarlarkList;
import net.starlark.java.eval.StarlarkValue;
@@ -68,7 +69,10 @@
Tuple.of("1", "3", "5"), Tuple.of("1", "2"), Tuple.of("3", "4"), Tuple.of("5", "6"));
assertThat(get("s_eight").getSet(Tuple.class).toList())
.containsExactly(
- Tuple.of(1, 3), Tuple.of("1", "2"), Tuple.of("3", "4"), Tuple.of("5", "6"));
+ Tuple.of(StarlarkInt.of(1), StarlarkInt.of(3)),
+ Tuple.of("1", "2"),
+ Tuple.of("3", "4"),
+ Tuple.of("5", "6"));
}
@Test
@@ -76,12 +80,14 @@
ev.exec("s = depset(['a', 'b'])");
assertThat(get("s").getSet(String.class).toList()).containsExactly("a", "b").inOrder();
assertThat(get("s").getSet(Object.class).toList()).containsExactly("a", "b").inOrder();
- assertThrows(Depset.TypeException.class, () -> get("s").getSet(Integer.class));
+ assertThrows(Depset.TypeException.class, () -> get("s").getSet(StarlarkInt.class));
// getSet argument must be a legal Starlark value class, or Object,
// but not some superclass that doesn't implement StarlarkValue.
- Depset ints = Depset.legacyOf(Order.STABLE_ORDER, Tuple.of(1, 2, 3));
- assertThat(ints.getSet(Integer.class).toString()).isEqualTo("[1, 2, 3]");
+ Depset ints =
+ Depset.legacyOf(
+ Order.STABLE_ORDER, Tuple.of(StarlarkInt.of(1), StarlarkInt.of(2), StarlarkInt.of(3)));
+ assertThat(ints.getSet(StarlarkInt.class).toString()).isEqualTo("[1, 2, 3]");
IllegalArgumentException ex =
assertThrows(IllegalArgumentException.class, () -> ints.getSet(Number.class));
assertThat(ex.getMessage()).contains("Number is not a subclass of StarlarkValue");
@@ -92,7 +98,7 @@
ev.exec("s = depset(direct = ['a', 'b'])");
assertThat(get("s").getSet(String.class).toList()).containsExactly("a", "b").inOrder();
assertThat(get("s").getSet(Object.class).toList()).containsExactly("a", "b").inOrder();
- assertThrows(Depset.TypeException.class, () -> get("s").getSet(Integer.class));
+ assertThrows(Depset.TypeException.class, () -> get("s").getSet(StarlarkInt.class));
}
@Test
@@ -100,7 +106,7 @@
ev.exec("s = depset(items = ['a', 'b'])");
assertThat(get("s").getSet(String.class).toList()).containsExactly("a", "b").inOrder();
assertThat(get("s").getSet(Object.class).toList()).containsExactly("a", "b").inOrder();
- assertThrows(Depset.TypeException.class, () -> get("s").getSet(Integer.class));
+ assertThrows(Depset.TypeException.class, () -> get("s").getSet(StarlarkInt.class));
}
@Test
@@ -109,7 +115,7 @@
assertThat(get("s").toList(String.class)).containsExactly("a", "b").inOrder();
assertThat(get("s").toList(Object.class)).containsExactly("a", "b").inOrder();
assertThat(get("s").toList()).containsExactly("a", "b").inOrder();
- assertThrows(Depset.TypeException.class, () -> get("s").toList(Integer.class));
+ assertThrows(Depset.TypeException.class, () -> get("s").toList(StarlarkInt.class));
}
@Test
@@ -118,7 +124,7 @@
assertThat(get("s").toList(String.class)).containsExactly("a", "b").inOrder();
assertThat(get("s").toList(Object.class)).containsExactly("a", "b").inOrder();
assertThat(get("s").toList()).containsExactly("a", "b").inOrder();
- assertThrows(Depset.TypeException.class, () -> get("s").toList(Integer.class));
+ assertThrows(Depset.TypeException.class, () -> get("s").toList(StarlarkInt.class));
}
@Test
@@ -127,7 +133,7 @@
assertThat(get("s").toList(String.class)).containsExactly("a", "b").inOrder();
assertThat(get("s").toList(Object.class)).containsExactly("a", "b").inOrder();
assertThat(get("s").toList()).containsExactly("a", "b").inOrder();
- assertThrows(Depset.TypeException.class, () -> get("s").toList(Integer.class));
+ assertThrows(Depset.TypeException.class, () -> get("s").toList(StarlarkInt.class));
}
@Test
@@ -322,10 +328,11 @@
@Test
public void testToListForStarlark() throws Exception {
- ev.exec("s = depset([3, 4, 5], transitive = [depset([2, 4, 6])])", "x = s.to_list()");
- Object value = ev.lookup("x");
- assertThat(value).isInstanceOf(StarlarkList.class);
- assertThat((Iterable<?>) value).containsExactly(2, 4, 6, 3, 5).inOrder();
+ ev.exec(
+ "s = depset([3, 4, 5], transitive = [depset([2, 4, 6])])",
+ "x = s.to_list()",
+ "y = [2, 4, 6, 3, 5]");
+ assertThat(ev.lookup("x")).isEqualTo(ev.lookup("y"));
}
@Test
@@ -469,7 +476,7 @@
public void testElementTypeOf() {
// legal values
assertThat(ElementType.of(String.class).toString()).isEqualTo("string");
- assertThat(ElementType.of(Integer.class).toString()).isEqualTo("int");
+ assertThat(ElementType.of(StarlarkInt.class).toString()).isEqualTo("int");
assertThat(ElementType.of(Boolean.class).toString()).isEqualTo("bool");
// concrete non-values
diff --git a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
index 998a9fe..75b4d8e 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
@@ -42,6 +42,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import net.starlark.java.eval.StarlarkInt;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -60,9 +61,9 @@
@Test
public void testBasics() throws Exception {
- Attribute attr = attr("foo", Type.INTEGER).mandatory().value(3).build();
+ Attribute attr = attr("foo", Type.INTEGER).mandatory().value(StarlarkInt.of(3)).build();
assertThat(attr.getName()).isEqualTo("foo");
- assertThat(attr.getDefaultValue(null)).isEqualTo(3);
+ assertThat(attr.getDefaultValue(null)).isEqualTo(StarlarkInt.of(3));
assertThat(attr.getType()).isEqualTo(Type.INTEGER);
assertThat(attr.isMandatory()).isTrue();
assertThat(attr.isDocumented()).isTrue();
@@ -75,7 +76,7 @@
NullPointerException e =
assertThrows(
NullPointerException.class,
- () -> attr("foo", Type.INTEGER).nonEmpty().value(3).build());
+ () -> attr("foo", Type.INTEGER).nonEmpty().value(StarlarkInt.of(3)).build());
assertThat(e).hasMessageThat().isEqualTo("attribute 'foo' must be a list");
}
@@ -92,7 +93,7 @@
IllegalStateException e =
assertThrows(
IllegalStateException.class,
- () -> attr("foo", Type.INTEGER).singleArtifact().value(3).build());
+ () -> attr("foo", Type.INTEGER).singleArtifact().value(StarlarkInt.of(3)).build());
assertThat(e).hasMessageThat().isEqualTo("attribute 'foo' must be a label-valued type");
}
@@ -119,10 +120,8 @@
*/
@Test
public void testConvenienceFactoriesDefaultValues() throws Exception {
- assertDefaultValue(0,
- attr("x", INTEGER).build());
- assertDefaultValue(42,
- attr("x", INTEGER).value(42).build());
+ assertDefaultValue(StarlarkInt.of(0), attr("x", INTEGER).build());
+ assertDefaultValue(StarlarkInt.of(42), attr("x", INTEGER).value(StarlarkInt.of(42)).build());
assertDefaultValue("",
attr("x", STRING).build());
@@ -158,8 +157,7 @@
public void testConvenienceFactoriesTypes() throws Exception {
assertType(INTEGER,
attr("x", INTEGER).build());
- assertType(INTEGER,
- attr("x", INTEGER).value(42).build());
+ assertType(INTEGER, attr("x", INTEGER).value(StarlarkInt.of(42)).build());
assertType(STRING,
attr("x", STRING).build());
diff --git a/src/test/java/com/google/devtools/build/lib/packages/RuleClassBuilderTest.java b/src/test/java/com/google/devtools/build/lib/packages/RuleClassBuilderTest.java
index ad4c470..73e303c 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/RuleClassBuilderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/RuleClassBuilderTest.java
@@ -30,6 +30,7 @@
import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassNamePredicate;
import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
import com.google.devtools.build.lib.packages.util.PackageLoadingTestCase;
+import net.starlark.java.eval.StarlarkInt;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -82,7 +83,7 @@
.add(attr("size", STRING).value("medium"))
.add(attr("timeout", STRING))
.add(attr("flaky", BOOLEAN).value(false))
- .add(attr("shard_count", INTEGER).value(-1))
+ .add(attr("shard_count", INTEGER).value(StarlarkInt.of(-1)))
.add(attr("local", BOOLEAN))
.build();
assertThat(ruleClassA.hasBinaryOutput()).isTrue();
diff --git a/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java b/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java
index 1e7ee19..4512457 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java
@@ -68,6 +68,7 @@
import java.util.Set;
import javax.annotation.Nullable;
import net.starlark.java.eval.StarlarkFunction;
+import net.starlark.java.eval.StarlarkInt;
import net.starlark.java.eval.StarlarkSemantics;
import net.starlark.java.eval.StarlarkThread;
import net.starlark.java.syntax.Location;
@@ -129,7 +130,7 @@
.value(Label.parseAbsolute("//default:label", ImmutableMap.of()))
.build(),
attr("my-labellist-attr", LABEL_LIST).mandatory().legacyAllowAnyFileType().build(),
- attr("my-integer-attr", INTEGER).value(42).build(),
+ attr("my-integer-attr", INTEGER).value(StarlarkInt.of(42)).build(),
attr("my-string-attr2", STRING).mandatory().value((String) null).build(),
attr("my-stringlist-attr", STRING_LIST).build(),
attr("my-sorted-stringlist-attr", STRING_LIST).orderIndependent().build());
@@ -194,7 +195,7 @@
assertThat(ruleClassA.getAttribute(1).getDefaultValue(null))
.isEqualTo(Label.parseAbsolute("//default:label", ImmutableMap.of()));
assertThat(ruleClassA.getAttribute(2).getDefaultValue(null)).isEqualTo(Collections.emptyList());
- assertThat(ruleClassA.getAttribute(3).getDefaultValue(null)).isEqualTo(42);
+ assertThat(ruleClassA.getAttribute(3).getDefaultValue(null)).isEqualTo(StarlarkInt.of(42));
// default explicitly specified
assertThat(ruleClassA.getAttribute(4).getDefaultValue(null)).isNull();
assertThat(ruleClassA.getAttribute(5).getDefaultValue(null)).isEqualTo(Collections.emptyList());
@@ -386,7 +387,7 @@
AttributeMap attributes = RawAttributeMapper.of(rule);
assertThat(attributes.get("my-label-attr", BuildType.LABEL).toString())
.isEqualTo("//default:label");
- assertThat(attributes.get("my-integer-attr", Type.INTEGER).intValue()).isEqualTo(42);
+ assertThat(attributes.get("my-integer-attr", Type.INTEGER).toIntUnchecked()).isEqualTo(42);
// missing attribute -> default chosen based on type
assertThat(attributes.get("my-string-attr", Type.STRING)).isEmpty();
assertThat(attributes.get("my-labellist-attr", BuildType.LABEL_LIST)).isEmpty();
diff --git a/src/test/java/com/google/devtools/build/lib/packages/SelectTest.java b/src/test/java/com/google/devtools/build/lib/packages/SelectTest.java
index 418b75a..3bcd5ad 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/SelectTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/SelectTest.java
@@ -22,6 +22,7 @@
import net.starlark.java.eval.Module;
import net.starlark.java.eval.Mutability;
import net.starlark.java.eval.Starlark;
+import net.starlark.java.eval.StarlarkInt;
import net.starlark.java.eval.StarlarkSemantics;
import net.starlark.java.eval.StarlarkThread;
import net.starlark.java.syntax.FileOptions;
@@ -55,7 +56,7 @@
public void testSelect() throws Exception {
SelectorList result = (SelectorList) eval("select({'a': 1})");
assertThat(((SelectorValue) Iterables.getOnlyElement(result.getElements())).getDictionary())
- .containsExactly("a", 1);
+ .containsExactly("a", StarlarkInt.of(1));
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/packages/StarlarkInfoTest.java b/src/test/java/com/google/devtools/build/lib/packages/StarlarkInfoTest.java
index d3595bd..cb34612 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/StarlarkInfoTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/StarlarkInfoTest.java
@@ -26,6 +26,7 @@
import java.util.Random;
import javax.annotation.Nullable;
import net.starlark.java.eval.EvalException;
+import net.starlark.java.eval.StarlarkInt;
import net.starlark.java.eval.StarlarkValue;
import net.starlark.java.syntax.Location;
import net.starlark.java.syntax.TokenKind;
@@ -46,14 +47,14 @@
@Test
public void instancesOfUnexportedProvidersAreMutable() throws Exception {
StarlarkProvider provider = makeProvider();
- StarlarkInfo info = makeInfoWithF1F2Values(provider, 5, null);
+ StarlarkInfo info = makeInfoWithF1F2Values(provider, StarlarkInt.of(5), null);
assertThat(info.isImmutable()).isFalse();
}
@Test
public void instancesOfExportedProvidersMayBeImmutable() throws Exception {
StarlarkProvider provider = makeExportedProvider();
- StarlarkInfo info = makeInfoWithF1F2Values(provider, 5, null);
+ StarlarkInfo info = makeInfoWithF1F2Values(provider, StarlarkInt.of(5), null);
assertThat(info.isImmutable()).isTrue();
}
@@ -61,7 +62,7 @@
public void mutableIfContentsAreMutable() throws Exception {
StarlarkProvider provider = makeExportedProvider();
StarlarkValue v = new StarlarkValue() {};
- StarlarkInfo info = makeInfoWithF1F2Values(provider, 5, v);
+ StarlarkInfo info = makeInfoWithF1F2Values(provider, StarlarkInt.of(5), v);
assertThat(info.isImmutable()).isFalse();
}
@@ -70,25 +71,25 @@
StarlarkProvider provider1 = makeProvider();
StarlarkProvider provider2 = makeProvider();
// equal providers and fields
- assertThat(makeInfoWithF1F2Values(provider1, 4, 5))
- .isEqualTo(makeInfoWithF1F2Values(provider1, 4, 5));
+ assertThat(makeInfoWithF1F2Values(provider1, StarlarkInt.of(4), StarlarkInt.of(5)))
+ .isEqualTo(makeInfoWithF1F2Values(provider1, StarlarkInt.of(4), StarlarkInt.of(5)));
// different providers => unequal
- assertThat(makeInfoWithF1F2Values(provider1, 4, 5))
- .isNotEqualTo(makeInfoWithF1F2Values(provider2, 4, 5));
+ assertThat(makeInfoWithF1F2Values(provider1, StarlarkInt.of(4), StarlarkInt.of(5)))
+ .isNotEqualTo(makeInfoWithF1F2Values(provider2, StarlarkInt.of(4), StarlarkInt.of(5)));
// different fields => unequal
- assertThat(makeInfoWithF1F2Values(provider1, 4, 5))
- .isNotEqualTo(makeInfoWithF1F2Values(provider1, 4, 6));
+ assertThat(makeInfoWithF1F2Values(provider1, StarlarkInt.of(4), StarlarkInt.of(5)))
+ .isNotEqualTo(makeInfoWithF1F2Values(provider1, StarlarkInt.of(4), StarlarkInt.of(6)));
// different sets of fields => unequal
- assertThat(makeInfoWithF1F2Values(provider1, 4, 5))
- .isNotEqualTo(makeInfoWithF1F2Values(provider1, 4, null));
+ assertThat(makeInfoWithF1F2Values(provider1, StarlarkInt.of(4), StarlarkInt.of(5)))
+ .isNotEqualTo(makeInfoWithF1F2Values(provider1, StarlarkInt.of(4), null));
}
@Test
public void concatWithDifferentProvidersFails() throws Exception {
StarlarkProvider provider1 = makeProvider();
StarlarkProvider provider2 = makeProvider();
- StarlarkInfo info1 = makeInfoWithF1F2Values(provider1, 4, 5);
- StarlarkInfo info2 = makeInfoWithF1F2Values(provider2, 4, 5);
+ StarlarkInfo info1 = makeInfoWithF1F2Values(provider1, StarlarkInt.of(4), StarlarkInt.of(5));
+ StarlarkInfo info2 = makeInfoWithF1F2Values(provider2, StarlarkInt.of(4), StarlarkInt.of(5));
EvalException expected =
assertThrows(EvalException.class, () -> info1.binaryOp(TokenKind.PLUS, info2, true));
assertThat(expected).hasMessageThat()
@@ -98,8 +99,8 @@
@Test
public void concatWithOverlappingFieldsFails() throws Exception {
StarlarkProvider provider1 = makeProvider();
- StarlarkInfo info1 = makeInfoWithF1F2Values(provider1, 4, 5);
- StarlarkInfo info2 = makeInfoWithF1F2Values(provider1, 4, null);
+ StarlarkInfo info1 = makeInfoWithF1F2Values(provider1, StarlarkInt.of(4), StarlarkInt.of(5));
+ StarlarkInfo info2 = makeInfoWithF1F2Values(provider1, StarlarkInt.of(4), null);
EvalException expected =
assertThrows(EvalException.class, () -> info1.binaryOp(TokenKind.PLUS, info2, true));
assertThat(expected)
@@ -110,23 +111,23 @@
@Test
public void concatWithSameFields() throws Exception {
StarlarkProvider provider = makeProvider();
- StarlarkInfo info1 = makeInfoWithF1F2Values(provider, 4, null);
- StarlarkInfo info2 = makeInfoWithF1F2Values(provider, null, 5);
+ StarlarkInfo info1 = makeInfoWithF1F2Values(provider, StarlarkInt.of(4), null);
+ StarlarkInfo info2 = makeInfoWithF1F2Values(provider, null, StarlarkInt.of(5));
StarlarkInfo result = info1.binaryOp(TokenKind.PLUS, info2, true);
assertThat(result.getFieldNames()).containsExactly("f1", "f2");
- assertThat(result.getValue("f1")).isEqualTo(4);
- assertThat(result.getValue("f2")).isEqualTo(5);
+ assertThat(result.getValue("f1")).isEqualTo(StarlarkInt.of(4));
+ assertThat(result.getValue("f2")).isEqualTo(StarlarkInt.of(5));
}
@Test
public void concatWithDifferentFields() throws Exception {
StarlarkProvider provider = makeProvider();
- StarlarkInfo info1 = makeInfoWithF1F2Values(provider, 4, null);
- StarlarkInfo info2 = makeInfoWithF1F2Values(provider, null, 5);
+ StarlarkInfo info1 = makeInfoWithF1F2Values(provider, StarlarkInt.of(4), null);
+ StarlarkInfo info2 = makeInfoWithF1F2Values(provider, null, StarlarkInt.of(5));
StarlarkInfo result = info1.binaryOp(TokenKind.PLUS, info2, true);
assertThat(result.getFieldNames()).containsExactly("f1", "f2");
- assertThat(result.getValue("f1")).isEqualTo(4);
- assertThat(result.getValue("f2")).isEqualTo(5);
+ assertThat(result.getValue("f1")).isEqualTo(StarlarkInt.of(4));
+ assertThat(result.getValue("f2")).isEqualTo(StarlarkInt.of(5));
}
/** Creates an unexported schemaless provider type with builtin location. */
diff --git a/src/test/java/com/google/devtools/build/lib/packages/TypeTest.java b/src/test/java/com/google/devtools/build/lib/packages/TypeTest.java
index 7265c0d..776e183 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/TypeTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/TypeTest.java
@@ -28,6 +28,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import net.starlark.java.eval.StarlarkInt;
import net.starlark.java.eval.StarlarkList;
import net.starlark.java.eval.Tuple;
import org.junit.Before;
@@ -50,9 +51,27 @@
@Test
public void testInteger() throws Exception {
- Object x = 3;
+ Object x = StarlarkInt.of(3);
assertThat(Type.INTEGER.convert(x, null)).isEqualTo(x);
assertThat(collectLabels(Type.INTEGER, x)).isEmpty();
+
+ // INTEGER rule attributes must be in signed 32-bit value range.
+ // (If we ever relax this, we'll need to audit every place that
+ // converts an attribute to an int using toIntUnchecked, since
+ // that operation might then fail, and extend the Package
+ // serialization protocol to support bigint.)
+ StarlarkInt big = StarlarkInt.of(111111111);
+ Type.ConversionException e =
+ assertThrows(
+ Type.ConversionException.class,
+ () -> Type.INTEGER.convert(StarlarkInt.multiply(big, big), "param"));
+ assertThat(e)
+ .hasMessageThat()
+ .contains("for param, got 12345678987654321, want value in signed 32-bit range");
+
+ // Ensure that the range of INTEGER.concat is int32.
+ assertThat(Type.INTEGER.concat(Arrays.asList(StarlarkInt.of(0x7fffffff), StarlarkInt.of(1))))
+ .isEqualTo(StarlarkInt.of(-0x80000000));
}
@Test
@@ -96,8 +115,8 @@
public void testBoolean() throws Exception {
Object myTrue = true;
Object myFalse = false;
- assertThat(Type.BOOLEAN.convert(1, null)).isEqualTo(Boolean.TRUE);
- assertThat(Type.BOOLEAN.convert(0, null)).isEqualTo(Boolean.FALSE);
+ assertThat(Type.BOOLEAN.convert(StarlarkInt.of(1), null)).isEqualTo(Boolean.TRUE);
+ assertThat(Type.BOOLEAN.convert(StarlarkInt.of(0), null)).isEqualTo(Boolean.FALSE);
assertThat(Type.BOOLEAN.convert(true, null)).isTrue();
assertThat(Type.BOOLEAN.convert(myTrue, null)).isTrue();
assertThat(Type.BOOLEAN.convert(false, null)).isFalse();
@@ -114,17 +133,21 @@
.hasMessageThat()
.isEqualTo("expected value of type 'int', but got \"unexpected\" (string)");
// Integers other than [0, 1] should fail.
- e = assertThrows(Type.ConversionException.class, () -> Type.BOOLEAN.convert(2, null));
+ e =
+ assertThrows(
+ Type.ConversionException.class, () -> Type.BOOLEAN.convert(StarlarkInt.of(2), null));
assertThat(e).hasMessageThat().isEqualTo("boolean is not one of [0, 1]");
- e = assertThrows(Type.ConversionException.class, () -> Type.BOOLEAN.convert(-1, null));
+ e =
+ assertThrows(
+ Type.ConversionException.class, () -> Type.BOOLEAN.convert(StarlarkInt.of(-1), null));
assertThat(e).hasMessageThat().isEqualTo("boolean is not one of [0, 1]");
}
@Test
public void testTriState() throws Exception {
- assertThat(BuildType.TRISTATE.convert(1, null)).isEqualTo(TriState.YES);
- assertThat(BuildType.TRISTATE.convert(0, null)).isEqualTo(TriState.NO);
- assertThat(BuildType.TRISTATE.convert(-1, null)).isEqualTo(TriState.AUTO);
+ assertThat(BuildType.TRISTATE.convert(StarlarkInt.of(1), null)).isEqualTo(TriState.YES);
+ assertThat(BuildType.TRISTATE.convert(StarlarkInt.of(0), null)).isEqualTo(TriState.NO);
+ assertThat(BuildType.TRISTATE.convert(StarlarkInt.of(-1), null)).isEqualTo(TriState.AUTO);
assertThat(BuildType.TRISTATE.convert(TriState.YES, null)).isEqualTo(TriState.YES);
assertThat(BuildType.TRISTATE.convert(TriState.NO, null)).isEqualTo(TriState.NO);
assertThat(BuildType.TRISTATE.convert(TriState.AUTO, null)).isEqualTo(TriState.AUTO);
@@ -137,9 +160,10 @@
@Test
public void testTriStateDoesNotAcceptArbitraryIntegers() throws Exception {
- List<Integer> listOfCases = Lists.newArrayList(2, 3, -5, -2, 20);
- for (Object entry : listOfCases) {
- assertThrows(Type.ConversionException.class, () -> BuildType.TRISTATE.convert(entry, null));
+ for (Integer i : Lists.newArrayList(2, 3, -5, -2, 20)) {
+ assertThrows(
+ Type.ConversionException.class,
+ () -> BuildType.TRISTATE.convert(StarlarkInt.of(i), null));
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/profiler/memory/AllocationTrackerTest.java b/src/test/java/com/google/devtools/build/lib/profiler/memory/AllocationTrackerTest.java
index 7991337..acee66b 100644
--- a/src/test/java/com/google/devtools/build/lib/profiler/memory/AllocationTrackerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/profiler/memory/AllocationTrackerTest.java
@@ -37,6 +37,7 @@
import net.starlark.java.eval.Mutability;
import net.starlark.java.eval.Starlark;
import net.starlark.java.eval.StarlarkCallable;
+import net.starlark.java.eval.StarlarkInt;
import net.starlark.java.eval.StarlarkSemantics;
import net.starlark.java.eval.StarlarkThread;
import net.starlark.java.syntax.FileOptions;
@@ -64,8 +65,8 @@
private class SamplerValue implements HasBinary {
@Override
public Object binaryOp(TokenKind op, Object that, boolean thisLeft) throws EvalException {
- if (op == TokenKind.PLUS && thisLeft && that instanceof Integer) {
- int size = (Integer) that;
+ if (op == TokenKind.PLUS && thisLeft && that instanceof StarlarkInt) {
+ int size = ((StarlarkInt) that).toIntUnchecked(); // test values are small
Object obj = new Object();
live.add(obj); // ensure that obj outlives the test assertions
tracker.sampleAllocation(1, "", obj, size);
diff --git a/src/test/java/com/google/devtools/build/lib/rules/python/PyStructUtilsTest.java b/src/test/java/com/google/devtools/build/lib/rules/python/PyStructUtilsTest.java
index 7e50d69..9a3a906 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/python/PyStructUtilsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/python/PyStructUtilsTest.java
@@ -33,6 +33,7 @@
import java.util.LinkedHashMap;
import java.util.Map;
import net.starlark.java.eval.EvalException;
+import net.starlark.java.eval.StarlarkInt;
import org.junit.Before;
import org.junit.Test;
import org.junit.function.ThrowingRunnable;
@@ -120,7 +121,8 @@
@Test
public void getTransitiveSources_WrongType() {
- StructImpl info = makeStruct(ImmutableMap.of(PyStructUtils.TRANSITIVE_SOURCES, 123));
+ StructImpl info =
+ makeStruct(ImmutableMap.of(PyStructUtils.TRANSITIVE_SOURCES, StarlarkInt.of(123)));
assertThrowsEvalExceptionContaining(
() -> PyStructUtils.getTransitiveSources(info),
"for transitive_sources, got int, want a depset of File");
@@ -151,7 +153,8 @@
@Test
public void getUsesSharedLibraries_WrongType() {
- StructImpl info = makeStruct(ImmutableMap.of(PyStructUtils.USES_SHARED_LIBRARIES, 123));
+ StructImpl info =
+ makeStruct(ImmutableMap.of(PyStructUtils.USES_SHARED_LIBRARIES, StarlarkInt.of(123)));
assertHasWrongTypeMessage(
() -> PyStructUtils.getUsesSharedLibraries(info), "uses_shared_libraries", "bool");
}
@@ -172,7 +175,7 @@
@Test
public void getImports_WrongType() {
- StructImpl info = makeStruct(ImmutableMap.of(PyStructUtils.IMPORTS, 123));
+ StructImpl info = makeStruct(ImmutableMap.of(PyStructUtils.IMPORTS, StarlarkInt.of(123)));
assertThrowsEvalExceptionContaining(
() -> PyStructUtils.getImports(info), "for imports, got int, want a depset of string");
}
@@ -190,7 +193,8 @@
@Test
public void getHasPy2OnlySources_WrongType() {
- StructImpl info = makeStruct(ImmutableMap.of(PyStructUtils.HAS_PY2_ONLY_SOURCES, 123));
+ StructImpl info =
+ makeStruct(ImmutableMap.of(PyStructUtils.HAS_PY2_ONLY_SOURCES, StarlarkInt.of(123)));
assertHasWrongTypeMessage(
() -> PyStructUtils.getHasPy2OnlySources(info), "has_py2_only_sources", "bool");
}
@@ -208,7 +212,8 @@
@Test
public void getHasPy3OnlySources_WrongType() {
- StructImpl info = makeStruct(ImmutableMap.of(PyStructUtils.HAS_PY3_ONLY_SOURCES, 123));
+ StructImpl info =
+ makeStruct(ImmutableMap.of(PyStructUtils.HAS_PY3_ONLY_SOURCES, StarlarkInt.of(123)));
assertHasWrongTypeMessage(
() -> PyStructUtils.getHasPy3OnlySources(info), "has_py3_only_sources", "bool");
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java
index c505229..e274f4f 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java
@@ -47,6 +47,7 @@
import java.io.InputStream;
import java.util.UUID;
import javax.annotation.Nullable;
+import net.starlark.java.eval.StarlarkInt;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -402,7 +403,8 @@
SkyframeExecutorTestUtils.evaluate(
getSkyframeExecutor(), skyKey, /*keepGoing=*/ false, reporter);
- assertThat(result.get(skyKey).getModule().getGlobals()).containsEntry("a_symbol", 5);
+ assertThat(result.get(skyKey).getModule().getGlobals())
+ .containsEntry("a_symbol", StarlarkInt.of(5));
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
index 3a1b30c..01c5faa 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
@@ -85,6 +85,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import javax.annotation.Nullable;
import net.starlark.java.eval.Module;
+import net.starlark.java.eval.StarlarkInt;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -1254,7 +1255,7 @@
Module cViaB = bLoads.get(":c.bzl");
assertThat(cViaB).isSameInstanceAs(cViaA);
- assertThat(cViaA.getGlobal("c")).isEqualTo(0);
+ assertThat(cViaA.getGlobal("c")).isEqualTo(StarlarkInt.of(0));
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkDefinedAspectsTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkDefinedAspectsTest.java
index fb74540..fb8086a 100644
--- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkDefinedAspectsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkDefinedAspectsTest.java
@@ -52,6 +52,7 @@
import com.google.devtools.build.lib.skyframe.AspectValueKey.AspectKey;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
import net.starlark.java.eval.Sequence;
+import net.starlark.java.eval.StarlarkInt;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -2460,7 +2461,7 @@
new StarlarkProvider.Key(
Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "PCollector");
StructImpl collector = (StructImpl) configuredAspect.get(pCollector);
- assertThat(collector.getValue("attr_value")).isEqualTo(30);
+ assertThat(collector.getValue("attr_value")).isEqualTo(StarlarkInt.of(30));
}
@Test
@@ -2515,7 +2516,7 @@
new StarlarkProvider.Key(
Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "PCollector");
StructImpl collector = (StructImpl) configuredAspect.get(pCollector);
- assertThat(collector.getValue("attr_value")).isEqualTo(30);
+ assertThat(collector.getValue("attr_value")).isEqualTo(StarlarkInt.of(30));
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
index 8d17f32..ac0aa23 100644
--- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
@@ -59,6 +59,7 @@
import net.starlark.java.eval.NoneType;
import net.starlark.java.eval.Sequence;
import net.starlark.java.eval.Starlark;
+import net.starlark.java.eval.StarlarkInt;
import net.starlark.java.eval.StarlarkList;
import org.junit.Before;
import org.junit.Test;
@@ -1412,7 +1413,7 @@
StructImpl declaredProvider = (StructImpl) configuredTarget.get(key);
assertThat(declaredProvider).isNotNull();
assertThat(declaredProvider.getProvider().getKey()).isEqualTo(key);
- assertThat(declaredProvider.getValue("x")).isEqualTo(1);
+ assertThat(declaredProvider.getValue("x")).isEqualTo(StarlarkInt.of(1));
}
@Test
@@ -1437,7 +1438,7 @@
StructImpl declaredProvider = (StructImpl) configuredTarget.get(key);
assertThat(declaredProvider).isNotNull();
assertThat(declaredProvider.getProvider().getKey()).isEqualTo(key);
- assertThat(declaredProvider.getValue("x")).isEqualTo(1);
+ assertThat(declaredProvider.getValue("x")).isEqualTo(StarlarkInt.of(1));
}
@Test
@@ -1463,7 +1464,7 @@
StructImpl declaredProvider = (StructImpl) configuredTarget.get(key);
assertThat(declaredProvider).isNotNull();
assertThat(declaredProvider.getProvider().getKey()).isEqualTo(key);
- assertThat(declaredProvider.getValue("x")).isEqualTo(1);
+ assertThat(declaredProvider.getValue("x")).isEqualTo(StarlarkInt.of(1));
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkOptionsParsingTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkOptionsParsingTest.java
index ea16805..ab72af3 100644
--- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkOptionsParsingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkOptionsParsingTest.java
@@ -23,6 +23,7 @@
import com.google.devtools.build.lib.util.Pair;
import com.google.devtools.common.options.OptionsParsingException;
import com.google.devtools.common.options.OptionsParsingResult;
+import net.starlark.java.eval.StarlarkInt;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -39,7 +40,8 @@
OptionsParsingResult result = parseStarlarkOptions("--//test:my_int_setting=666");
assertThat(result.getStarlarkOptions()).hasSize(1);
- assertThat(result.getStarlarkOptions().get("//test:my_int_setting")).isEqualTo(666);
+ assertThat(result.getStarlarkOptions().get("//test:my_int_setting"))
+ .isEqualTo(StarlarkInt.of(666));
assertThat(result.getResidue()).isEmpty();
}
@@ -51,7 +53,8 @@
OptionsParsingResult result = parseStarlarkOptions("--//test:my_int_setting 666");
assertThat(result.getStarlarkOptions()).hasSize(1);
- assertThat(result.getStarlarkOptions().get("//test:my_int_setting")).isEqualTo(666);
+ assertThat(result.getStarlarkOptions().get("//test:my_int_setting"))
+ .isEqualTo(StarlarkInt.of(666));
assertThat(result.getResidue()).isEmpty();
}
@@ -66,7 +69,7 @@
assertThat(result.getStarlarkOptions()).hasSize(1);
assertThat(result.getStarlarkOptions().get("@starlark_options_test//test:my_int_setting"))
- .isEqualTo(666);
+ .isEqualTo(StarlarkInt.of(666));
assertThat(result.getResidue()).isEmpty();
}
@@ -206,7 +209,8 @@
parseStarlarkOptions("--//test:my_int_setting=4 --//test:my_int_setting=7");
assertThat(result.getStarlarkOptions()).hasSize(1);
- assertThat(result.getStarlarkOptions().get("//test:my_int_setting")).isEqualTo(7);
+ assertThat(result.getStarlarkOptions().get("//test:my_int_setting"))
+ .isEqualTo(StarlarkInt.of(7));
assertThat(result.getResidue()).isEmpty();
}
@@ -232,8 +236,10 @@
assertThat(result.getResidue()).isEmpty();
assertThat(result.getStarlarkOptions()).hasSize(2);
- assertThat(result.getStarlarkOptions().get("//test:my_int_setting")).isEqualTo(0);
- assertThat(result.getStarlarkOptions().get("//test:my_other_int_setting")).isEqualTo(0);
+ assertThat(result.getStarlarkOptions().get("//test:my_int_setting"))
+ .isEqualTo(StarlarkInt.of(0));
+ assertThat(result.getStarlarkOptions().get("//test:my_other_int_setting"))
+ .isEqualTo(StarlarkInt.of(0));
}
// test --non_build_setting
@@ -318,7 +324,8 @@
OptionsParsingResult result = parseStarlarkOptions("--//test:my_int_setting=15");
- assertThat(result.getStarlarkOptions().get("//test:my_int_setting")).isEqualTo(15);
+ assertThat(result.getStarlarkOptions().get("//test:my_int_setting"))
+ .isEqualTo(StarlarkInt.of(15));
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java
index 7a87200..45c3d2b 100644
--- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java
@@ -61,6 +61,7 @@
import net.starlark.java.eval.Module;
import net.starlark.java.eval.Mutability;
import net.starlark.java.eval.Starlark;
+import net.starlark.java.eval.StarlarkInt;
import net.starlark.java.eval.StarlarkList;
import net.starlark.java.eval.Tuple;
import net.starlark.java.syntax.ParserInput;
@@ -639,8 +640,8 @@
public void testAttrIntValues() throws Exception {
Attribute attr = buildAttribute("a1", "attr.int(values = [1, 2])");
PredicateWithMessage<Object> predicate = attr.getAllowedValues();
- assertThat(predicate.apply(2)).isTrue();
- assertThat(predicate.apply(3)).isFalse();
+ assertThat(predicate.apply(StarlarkInt.of(2))).isTrue();
+ assertThat(predicate.apply(StarlarkInt.of(3))).isFalse();
}
@Test
@@ -893,7 +894,50 @@
"r1 = rule(impl, attrs = {'a1': attr.int(default = 40+2)})");
RuleClass c = ((StarlarkRuleFunction) ev.lookup("r1")).getRuleClass();
Attribute a = c.getAttributeByName("a1");
- assertThat(a.getDefaultValueUnchecked()).isEqualTo(42);
+ assertThat(a.getDefaultValueUnchecked()).isEqualTo(StarlarkInt.of(42));
+ }
+
+ @Test
+ public void testIntDefaultValueMustBeInt32() throws Exception {
+ // This is a test of the loading phase. Move somewhere more appropriate.
+ ev.checkEvalErrorContains(
+ "for parameter 'default' of attribute '', got 4294967296, want value in signed 32-bit"
+ + " range",
+ "attr.int(default = 0x10000 * 0x10000)");
+ ev.checkEvalErrorContains(
+ "for element 0 of parameter 'default' of attribute '', got 4294967296, want value in"
+ + " signed 32-bit range",
+ "attr.int_list(default = [0x10000 * 0x10000])");
+ }
+
+ @Test
+ public void testIntAttributeValueMustBeInt32() throws Exception {
+ // This is a test of the loading phase. Move somewhere more appropriate.
+ scratch.file(
+ "p/inc.bzl", //
+ "def _impl(ctx): pass",
+ "r = rule(_impl, attrs = dict(i=attr.int()))");
+ scratch.file(
+ "p/BUILD", //
+ "load('inc.bzl', 'r')",
+ "r(name = 'p', i = 0x10000 * 0x10000)");
+ AssertionError expected = assertThrows(AssertionError.class, () -> createRuleContext("//p"));
+ assertThat(expected)
+ .hasMessageThat()
+ .contains(
+ "for attribute 'i' in 'r' rule, got 4294967296, want value in signed 32-bit range");
+ }
+
+ @Test
+ public void testIntegerConcatTruncates() throws Exception {
+ // The Type.INTEGER.concat operator, as used to resolve select(int)+select(int)
+ // after rule construction, has a range of int32.
+ scratch.file(
+ "p/BUILD", //
+ "s = select({'//conditions:default': -0x7fffffff})", // -0x7fffffff + -0x7fffffff = 2
+ "cc_test(name='c', shard_count = s+s)");
+ StarlarkRuleContext context = createRuleContext("//p:c");
+ assertThat(context.getAttr().getValue("shard_count")).isEqualTo(StarlarkInt.of(2));
}
@Test
@@ -1126,8 +1170,8 @@
// TODO(fwe): cannot be handled by current testing suite
ev.exec("x = struct(a = 1, b = 2)");
ClassObject x = (ClassObject) ev.lookup("x");
- assertThat(x.getValue("a")).isEqualTo(1);
- assertThat(x.getValue("b")).isEqualTo(2);
+ assertThat(x.getValue("a")).isEqualTo(StarlarkInt.of(1));
+ assertThat(x.getValue("b")).isEqualTo(StarlarkInt.of(2));
}
@Test
@@ -1162,8 +1206,8 @@
@Test
public void testStructAccessingFieldsFromStarlark() throws Exception {
ev.exec("x = struct(a = 1, b = 2)", "x1 = x.a", "x2 = x.b");
- assertThat(ev.lookup("x1")).isEqualTo(1);
- assertThat(ev.lookup("x2")).isEqualTo(2);
+ assertThat(ev.lookup("x1")).isEqualTo(StarlarkInt.of(1));
+ assertThat(ev.lookup("x2")).isEqualTo(StarlarkInt.of(2));
}
@Test
@@ -1189,7 +1233,7 @@
@Test
public void testStructAccessingFunctionFieldWithArgs() throws Exception {
ev.exec("def f(x): return x+5", "x = struct(a = f, b = 2)", "x1 = x.a(1)");
- assertThat(ev.lookup("x1")).isEqualTo(6);
+ assertThat(ev.lookup("x1")).isEqualTo(StarlarkInt.of(6));
}
@Test
@@ -1217,10 +1261,10 @@
"y = struct(c = 1, d = 2)",
"z = x + y\n");
StructImpl z = (StructImpl) ev.lookup("z");
- assertThat(z.getValue("a")).isEqualTo(1);
- assertThat(z.getValue("b")).isEqualTo(2);
- assertThat(z.getValue("c")).isEqualTo(1);
- assertThat(z.getValue("d")).isEqualTo(2);
+ assertThat(z.getValue("a")).isEqualTo(StarlarkInt.of(1));
+ assertThat(z.getValue("b")).isEqualTo(StarlarkInt.of(2));
+ assertThat(z.getValue("c")).isEqualTo(StarlarkInt.of(1));
+ assertThat(z.getValue("d")).isEqualTo(StarlarkInt.of(2));
}
@Test
@@ -1243,10 +1287,10 @@
" return x",
"x = func()");
StructImpl x = (StructImpl) ev.lookup("x");
- assertThat(x.getValue("a")).isEqualTo(1);
- assertThat(x.getValue("b")).isEqualTo(2);
- assertThat(x.getValue("c")).isEqualTo(1);
- assertThat(x.getValue("d")).isEqualTo(2);
+ assertThat(x.getValue("a")).isEqualTo(StarlarkInt.of(1));
+ assertThat(x.getValue("b")).isEqualTo(StarlarkInt.of(2));
+ assertThat(x.getValue("c")).isEqualTo(StarlarkInt.of(1));
+ assertThat(x.getValue("d")).isEqualTo(StarlarkInt.of(2));
}
@Test
@@ -1301,7 +1345,7 @@
"s = struct(x = {'a' : 1})", //
"s.x['b'] = 2\n");
assertThat(((StructImpl) ev.lookup("s")).getValue("x"))
- .isEqualTo(ImmutableMap.of("a", 1, "b", 2));
+ .isEqualTo(ImmutableMap.of("a", StarlarkInt.of(1), "b", StarlarkInt.of(2)));
}
@Test
@@ -1324,21 +1368,22 @@
StarlarkList.<Object>of(
mu,
StructProvider.STRUCT.create(
- ImmutableMap.<String, Object>of("x", Dict.<Object, Object>of(mu, 1, 1)),
+ ImmutableMap.<String, Object>of(
+ "x", Dict.<Object, Object>of(mu, StarlarkInt.of(1), StarlarkInt.of(1))),
"no field '%s'"),
Tuple.of()),
"b", Tuple.of(),
- "c", Dict.<Object, Object>of(mu, 2, 2)),
+ "c", Dict.<Object, Object>of(mu, StarlarkInt.of(2), StarlarkInt.of(2))),
"no field '%s'");
}
@Test
public void testStructMutabilityShallow() throws Exception {
- assertThat(Starlark.isImmutable(makeStruct("a", 1))).isTrue();
+ assertThat(Starlark.isImmutable(makeStruct("a", StarlarkInt.of(1)))).isTrue();
}
private static StarlarkList<Object> makeList(@Nullable Mutability mu) {
- return StarlarkList.<Object>of(mu, 1, 2, 3);
+ return StarlarkList.<Object>of(mu, StarlarkInt.of(1), StarlarkInt.of(2), StarlarkInt.of(3));
}
@Test
@@ -1356,7 +1401,7 @@
@Test
public void declaredProviders() throws Exception {
evalAndExport(ev, "data = provider()", "d = data(x = 1, y ='abc')", "d_x = d.x", "d_y = d.y");
- assertThat(ev.lookup("d_x")).isEqualTo(1);
+ assertThat(ev.lookup("d_x")).isEqualTo(StarlarkInt.of(1));
assertThat(ev.lookup("d_y")).isEqualTo("abc");
StarlarkProvider dataConstructor = (StarlarkProvider) ev.lookup("data");
StructImpl data = (StructImpl) ev.lookup("d");
@@ -1376,7 +1421,7 @@
"dxy = dx + dy",
"x = dxy.x",
"y = dxy.y");
- assertThat(ev.lookup("x")).isEqualTo(1);
+ assertThat(ev.lookup("x")).isEqualTo(StarlarkInt.of(1));
assertThat(ev.lookup("y")).isEqualTo("abc");
StarlarkProvider dataConstructor = (StarlarkProvider) ev.lookup("data");
StructImpl dx = (StructImpl) ev.lookup("dx");
@@ -1406,8 +1451,8 @@
"d3 = d1 + d2",
"f1 = d3.f1",
"f2 = d3.f2");
- assertThat(ev.lookup("f1")).isEqualTo(4);
- assertThat(ev.lookup("f2")).isEqualTo(5);
+ assertThat(ev.lookup("f1")).isEqualTo(StarlarkInt.of(4));
+ assertThat(ev.lookup("f2")).isEqualTo(StarlarkInt.of(5));
}
@Test
@@ -1632,8 +1677,8 @@
StarlarkInfo p1 = (StarlarkInfo) ev.lookup("p1");
assertThat(p1.getProvider()).isEqualTo(p);
- assertThat(ev.lookup("x")).isEqualTo(1);
- assertThat(ev.lookup("y")).isEqualTo(2);
+ assertThat(ev.lookup("x")).isEqualTo(StarlarkInt.of(1));
+ assertThat(ev.lookup("y")).isEqualTo(StarlarkInt.of(2));
}
@Test
@@ -1648,8 +1693,8 @@
StarlarkInfo p1 = (StarlarkInfo) ev.lookup("p1");
assertThat(p1.getProvider()).isEqualTo(p);
- assertThat(ev.lookup("x")).isEqualTo(1);
- assertThat(ev.lookup("y")).isEqualTo(2);
+ assertThat(ev.lookup("x")).isEqualTo(StarlarkInt.of(1));
+ assertThat(ev.lookup("y")).isEqualTo(StarlarkInt.of(2));
}
@Test
@@ -1663,7 +1708,7 @@
StarlarkInfo p1 = (StarlarkInfo) ev.lookup("p1");
assertThat(p1.getProvider()).isEqualTo(p);
- assertThat(ev.lookup("y")).isEqualTo(2);
+ assertThat(ev.lookup("y")).isEqualTo(StarlarkInt.of(2));
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleContextTest.java
index 52465e3..de47e1d 100644
--- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleContextTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleContextTest.java
@@ -64,6 +64,7 @@
import net.starlark.java.eval.Mutability;
import net.starlark.java.eval.Sequence;
import net.starlark.java.eval.Starlark;
+import net.starlark.java.eval.StarlarkInt;
import net.starlark.java.eval.StarlarkList;
import org.junit.Before;
import org.junit.Test;
@@ -2614,7 +2615,7 @@
"BuildSettingInfo");
StructImpl buildSettingInfo = (StructImpl) buildSetting.get(key);
- assertThat(buildSettingInfo.getValue("value")).isEqualTo(24);
+ assertThat(buildSettingInfo.getValue("value")).isEqualTo(StarlarkInt.of(24));
}
@Test
@@ -2628,7 +2629,7 @@
"BuildSettingInfo");
StructImpl buildSettingInfo = (StructImpl) buildSetting.get(key);
- assertThat(buildSettingInfo.getValue("value")).isEqualTo(42);
+ assertThat(buildSettingInfo.getValue("value")).isEqualTo(StarlarkInt.of(42));
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleImplementationFunctionsTest.java
index aec46ba..f41a7c2 100644
--- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleImplementationFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleImplementationFunctionsTest.java
@@ -74,6 +74,7 @@
import net.starlark.java.eval.Printer;
import net.starlark.java.eval.Sequence;
import net.starlark.java.eval.Starlark;
+import net.starlark.java.eval.StarlarkInt;
import net.starlark.java.eval.StarlarkList;
import net.starlark.java.eval.StarlarkThread;
import org.junit.Before;
@@ -1511,7 +1512,7 @@
.isEqualTo(
new StarlarkProvider.Key(
Label.parseAbsolute("//test:foo.bzl", ImmutableMap.of()), "foo_provider"));
- assertThat(((StructImpl) provider).getValue("a")).isEqualTo(123);
+ assertThat(((StructImpl) provider).getValue("a")).isEqualTo(StarlarkInt.of(123));
}
@Test
@@ -2311,15 +2312,15 @@
public void testArgsAddInvalidTypesForArgAndValues() throws Exception {
setRuleContext(createRuleContext("//foo:foo"));
ev.checkEvalErrorContains(
- "expected value of type 'string' for arg name, got 'Integer'",
+ "expected value of type 'string' for arg name, got 'int'",
"args = ruleContext.actions.args()",
"args.add(1, 'value')");
ev.checkEvalErrorContains(
- "expected value of type 'string' for arg name, got 'Integer'",
+ "expected value of type 'string' for arg name, got 'int'",
"args = ruleContext.actions.args()",
"args.add_all(1, [1, 2])");
ev.checkEvalErrorContains(
- "expected value of type 'sequence or depset' for values, got 'Integer'",
+ "expected value of type 'sequence or depset' for values, got 'int'",
"args = ruleContext.actions.args()",
"args.add_all(1)");
ev.checkEvalErrorContains(
@@ -2417,7 +2418,7 @@
CommandLineExpansionException e =
assertThrows(CommandLineExpansionException.class, () -> action.getArguments());
assertThat(e.getMessage())
- .contains("Expected map_each to return string, None, or list of strings, found Integer");
+ .contains("Expected map_each to return string, None, or list of strings, found int");
}
@Test
