Revert "[VM] Enable --limit-ints-to-64-bits in Dart 2.0 precompiler"

This reverts commit 752dd8921a.

Reason: buildbot failures. Batch compiler which is used on certain
buildbots doesn't have --limit-ints-to-64-bits enabled yet.

Issue: https://github.com/dart-lang/sdk/issues/31339
Change-Id: I75a3940f981f47cb83425b99842c15c7d81b3c2d
Reviewed-on: https://dart-review.googlesource.com/29701
Reviewed-by: Alexander Markov <alexmarkov@google.com>
This commit is contained in:
Alexander Markov 2017-12-14 22:04:16 +00:00
parent e0f5891850
commit ab8629af65
8 changed files with 10 additions and 23 deletions

View file

@ -36,5 +36,4 @@ BIN_DIR="$OUT_DIR$DART_CONFIGURATION"
exec "$BIN_DIR"/dart_precompiled_runtime \
--strong \
--reify-generic-functions \
--limit-ints-to-64-bits \
"$@"

View file

@ -8,13 +8,6 @@
set -e
# Enable Dart 2.0 fixed-size integers for gen_kernel if running in strong mode.
for arg in "$@"; do
if [ "x$arg" == "x--strong-mode" ]; then
VM_FLAGS="--limit-ints-to-64-bits"
fi
done
function follow_links() {
file="$1"
while [ -h "$file" ]; do
@ -42,4 +35,4 @@ else
OUT_DIR="$SDK_DIR/out"
fi
exec "$DART" $VM_FLAGS "${SDK_DIR}/pkg/vm/bin/gen_kernel.dart" $@
exec "$DART" "${SDK_DIR}/pkg/vm/bin/gen_kernel.dart" $@

View file

@ -67,9 +67,7 @@ export DART_CONFIGURATION=${DART_CONFIGURATION:-ReleaseX64}
BIN_DIR="$OUT_DIR/$DART_CONFIGURATION"
# Step 1: Generate Kernel binary from the input Dart source.
"$BIN_DIR"/dart \
--limit-ints-to-64-bits \
"${SDK_DIR}/pkg/vm/bin/gen_kernel.dart" \
"$BIN_DIR"/dart "${SDK_DIR}/pkg/vm/bin/gen_kernel.dart" \
--platform "${BIN_DIR}/vm_platform_strong.dill" \
--aot \
$PACKAGES \
@ -80,7 +78,6 @@ BIN_DIR="$OUT_DIR/$DART_CONFIGURATION"
exec "$BIN_DIR"/dart_bootstrap \
--strong \
--reify-generic-functions \
--limit-ints-to-64-bits \
--snapshot-kind=app-aot \
--use-blobs \
--snapshot="$SNAPSHOT_FILE" \

View file

@ -1977,9 +1977,8 @@ instanceof4_test/01: Pass
instanceof4_test/01: RuntimeError
instanceof4_test/none: Pass
instanceof4_test/none: RuntimeError
int64_literal_test/04: CompileTimeError # Issue 31369
int64_literal_test/05: CompileTimeError # Issue 31369
int64_literal_test/40: CompileTimeError # Issue 31369
int64_literal_test/03: MissingCompileTimeError # http://dartbug.com/31479
int64_literal_test/30: MissingCompileTimeError # http://dartbug.com/31479
interface_test/00: MissingCompileTimeError
invocation_mirror2_test: SkipByDesign
invocation_mirror_invoke_on2_test: SkipByDesign

View file

@ -11,8 +11,7 @@
# to add them.
[ $compiler == dartkp ]
typed_data/int32x4_arithmetic_test/int64: CompileTimeError # Issue 31369
typed_data/int32x4_arithmetic_test/none: CompileTimeError # Issue 31369
typed_data/int32x4_arithmetic_test/int64: CompileTimeError # Issue 31339
[ $arch == x64 && $compiler == dartk && $mode == debug && $runtime == vm && $strong ]
mirrors/invocation_fuzz_test: Skip # Because it times out, issue 29439.
@ -173,8 +172,8 @@ mirrors/invocation_fuzz_test/smi: RuntimeError
mirrors/invocation_fuzz_test/string: Crash
mirrors/invoke_private_test: RuntimeError
mirrors/invoke_private_wrong_library_test: RuntimeError
mirrors/invoke_throws_test: Crash
mirrors/invoke_throws_test: RuntimeError
mirrors/invoke_throws_test: Crash
mirrors/lazy_static_test: CompileTimeError # Issue 31402 (Invocation arguments)
mirrors/library_declarations_test/01: CompileTimeError # Issue 31402 (Invocation arguments)
mirrors/library_declarations_test/none: CompileTimeError # Issue 31402 (Invocation arguments)

View file

@ -38,7 +38,7 @@ main() {
Expect.equals(2305843009213693952, shiftLeft1(61));
// Deoptimize on 64 bits.
Expect.equals(4611686018427387904, shiftLeft1(62));
Expect.equals(-9223372036854775808, shiftLeft1(63));
Expect.equals(9223372036854775808, shiftLeft1(63));
Expect.equals(8448, shiftLeft8448(0));
Expect.equals(1081344, shiftLeft8448(7));

View file

@ -115,7 +115,7 @@ void testUint64ToSmi() {
intArray[0] = 4611686018427387903; // SmiMax
intArray[1] = -1; // 0xFFFFFFFFFFFFFFFF : 18446744073709551615
intArray[2] = 4611686018427387904; // SmiMax+1
intArray[3] = -9223372036854775808;
intArray[3] = 9223372036854775808;
var x = intArray[0];
var y = intArray[1];
var z = intArray[2];
@ -123,7 +123,7 @@ void testUint64ToSmi() {
Expect.equals(4611686018427387903, x);
Expect.equals(-1, y);
Expect.equals(4611686018427387904, z);
Expect.equals(-9223372036854775808, w);
Expect.equals(9223372036854775808, w);
}
main() {

View file

@ -28,7 +28,7 @@ class MediumIntegerTest {
Expect.equals(1234567890123456791, a + b);
Expect.equals(1234567890123456791, b + a);
a = 9223372036854775807;
Expect.equals(-9223372036854775808, a + 1);
Expect.equals(9223372036854775808, a + 1);
// Mint and Mint.
a = 100000000000000001;