Alexander Markov
da8cb470cc
Size of a large application:
Before: 26628600
After: 21480120 (-19.3%)
Size of snapshots:
isolate_snapshot_framework.bin
Before: 9322496
After: 6782976 (-27.2%)
isolate_snapshot_product_framework.bin
Before: 9166848
After: 6602752 (-27.9%)
Regressions in tests:
1) Test language_2/type_alias_equality_test/04 fails similarly to default mode, as VM
does not implement comparison of function types according to the specification.
Previously this test was passing as function types were canonicalized in bytecode,
which was not always correct. This CL fixes the problem with canonicalization of
function types in bytecode and the test starts failing again.
2) Tests standalone_2/entrypoints_verification_test, standalone_2/io/test_extension_test,
standalone_2/io/test_extension_fail_test fail as native extensions are not supported
in bytecode yet. These tests start passing after df5e7aac17,
which switched bytecode tests to kernel service (on x64), because kernel service doesn't
drop ASTs. This CL switches from reading AST library declarations to bytecode even if
AST is not removed, so tests fail again.
Change-Id: I8b7ba44bfa49d0b1599b2509553ff7c831a4e244
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/104700
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Martin Kustermann <kustermann@google.com>
Reviewed-by: Régis Crelier <regis@google.com>
Commit-Queue: Alexander Markov <alexmarkov@google.com>
89 lines
2.6 KiB
Dart
89 lines
2.6 KiB
Dart
// Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file
|
|
// for details. All rights reserved. Use of this source code is governed by a
|
|
// BSD-style license that can be found in the LICENSE file.
|
|
|
|
library vm.bytecode.source_positions;
|
|
|
|
import 'bytecode_serialization.dart'
|
|
show
|
|
BufferedWriter,
|
|
BufferedReader,
|
|
PackedUInt30DeltaEncoder,
|
|
PackedUInt30DeltaDecoder,
|
|
SLEB128DeltaEncoder,
|
|
SLEB128DeltaDecoder;
|
|
|
|
/// Maintains mapping between bytecode instructions and source positions.
|
|
class SourcePositions {
|
|
final Map<int, int> mapping = <int, int>{}; // PC -> fileOffset
|
|
int _lastPc = 0;
|
|
int _lastOffset = 0;
|
|
|
|
SourcePositions();
|
|
|
|
void add(int pc, int fileOffset) {
|
|
assert(pc > _lastPc);
|
|
assert(fileOffset >= 0);
|
|
if (fileOffset != _lastOffset) {
|
|
mapping[pc] = fileOffset;
|
|
_lastPc = pc;
|
|
_lastOffset = fileOffset;
|
|
}
|
|
}
|
|
|
|
void write(BufferedWriter writer) {
|
|
writer.writePackedUInt30(mapping.length);
|
|
final encodePC = new PackedUInt30DeltaEncoder();
|
|
final encodeOffset = new SLEB128DeltaEncoder();
|
|
mapping.forEach((int pc, int fileOffset) {
|
|
encodePC.write(writer, pc);
|
|
encodeOffset.write(writer, fileOffset);
|
|
});
|
|
}
|
|
|
|
SourcePositions.read(BufferedReader reader) {
|
|
final int length = reader.readPackedUInt30();
|
|
final decodePC = new PackedUInt30DeltaDecoder();
|
|
final decodeOffset = new SLEB128DeltaDecoder();
|
|
for (int i = 0; i < length; ++i) {
|
|
int pc = decodePC.read(reader);
|
|
int fileOffset = decodeOffset.read(reader);
|
|
add(pc, fileOffset);
|
|
}
|
|
}
|
|
|
|
@override
|
|
String toString() => mapping.toString();
|
|
|
|
Map<int, String> getBytecodeAnnotations() {
|
|
return mapping.map((int pc, int fileOffset) =>
|
|
new MapEntry(pc, 'source position $fileOffset'));
|
|
}
|
|
}
|
|
|
|
/// Keeps file offsets of line starts. This information is used to
|
|
/// decode source positions to line/column.
|
|
class LineStarts {
|
|
final List<int> lineStarts;
|
|
|
|
LineStarts(this.lineStarts);
|
|
|
|
void write(BufferedWriter writer) {
|
|
writer.writePackedUInt30(lineStarts.length);
|
|
final encodeLineStarts = new PackedUInt30DeltaEncoder();
|
|
for (int lineStart in lineStarts) {
|
|
encodeLineStarts.write(writer, lineStart);
|
|
}
|
|
}
|
|
|
|
factory LineStarts.read(BufferedReader reader) {
|
|
final decodeLineStarts = new PackedUInt30DeltaDecoder();
|
|
final lineStarts = new List<int>.generate(
|
|
reader.readPackedUInt30(), (_) => decodeLineStarts.read(reader));
|
|
return new LineStarts(lineStarts);
|
|
}
|
|
|
|
@override
|
|
String toString() => 'Line starts: $lineStarts';
|
|
}
|