dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[vm/ffi] Fix representation of value for 8-bit and 16-bit FFI loads and stores

Browse Source 
Previously, FFI store could use kUnboxedUint32 for value being stored
via 8-bit or 16-bit StoreIndexed instruction. However, such
StoreIndexed instructions require kUnboxedIntPtr representation.
Due to the mismatch in the representations, SelectRepresentations
pass inserts a speculative (deoptimizing) IntConverter instruction,
which cases crash in AOT mode. Similar problem exists for FFI loads.

This change corrects representation when unboxing value in the body
of FFI store intrinsics and when boxing the value in FFI loads,
so representation of the value matches representation required by
StoreIndexed / returned by LoadIndexed.

TEST=ffi/regress_flutter79441_test
Fixes https://github.com/flutter/flutter/issues/79441

Change-Id: Ida144e8d2e7a69d6767c9d4447bb20e79d847d48
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/193824
Commit-Queue: Alexander Markov <alexmarkov@google.com>
Reviewed-by: Daco Harkes <dacoharkes@google.com>
Reviewed-by: Martin Kustermann <kustermann@google.com>
This commit is contained in:
Alexander Markov
2021-04-06 21:11:23 +00:00
committed by commit-bot@chromium.org
parent 1bf4b0ce2f
commit 707cd928af
3 changed files with 96 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/vm/compiler/frontend/kernel_to_il.cc
+20
View File
@@ -1332,6 +1332,16 @@ FlowGraph* FlowGraphBuilder::BuildGraphOfRecognizedMethod(
body += FloatToDouble();
}
body += Box(kUnboxedDouble);
} else if (kind == MethodRecognizer::kFfiLoadInt8 ||
kind == MethodRecognizer::kFfiLoadInt16 ||
kind == MethodRecognizer::kFfiLoadUint8 ||
kind == MethodRecognizer::kFfiLoadUint16) {
// LoadIndexed instruction with 8-bit and 16-bit elements
// results in value with kUnboxedIntPtr representation
// (see LoadIndexedInstr::representation).
// Avoid any unnecessary (and potentially deoptimizing) int
// conversions by using the correct representation at the first place.
body += Box(kUnboxedIntPtr);
} else {
body += Box(native_rep.AsRepresentationOverApprox(zone_));
if (kind == MethodRecognizer::kFfiLoadPointer) {
@@ -1462,6 +1472,16 @@ FlowGraph* FlowGraphBuilder::BuildGraphOfRecognizedMethod(
kind == MethodRecognizer::kFfiStoreFloatUnaligned) {
body += DoubleToFloat();
}
} else if (kind == MethodRecognizer::kFfiStoreInt8 ||
kind == MethodRecognizer::kFfiStoreInt16 ||
kind == MethodRecognizer::kFfiStoreUint8 ||
kind == MethodRecognizer::kFfiStoreUint16) {
// StoreIndexed instruction with 8-bit and 16-bit elements
// takes value with kUnboxedIntPtr representation
// (see StoreIndexedInstr::RequiredInputRepresentation).
// Avoid any unnecessary (and potentially deoptimizing) int
// conversions by using the correct representation at the first place.
body += UnboxTruncate(kUnboxedIntPtr);
} else {
body += UnboxTruncate(native_rep.AsRepresentationOverApprox(zone_));
}