languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-18 22:11:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid devirtualization of invocations of Object members

Browse source 
This CL fixes incorrect devirtualization of invocations of methods and
getters from Object, as null also implements Object members.

Issue: https://github.com/dart-lang/sdk/issues/30480
Change-Id: I39b2e1dd6147482b1331527d61b76841ae401343
Reviewed-on: https://dart-review.googlesource.com/9742
Reviewed-by: Vyacheslav Egorov <vegorov@google.com>
Commit-Queue: Vyacheslav Egorov <vegorov@google.com>
This commit is contained in:
Alexander Markov 2017-10-02 16:35:56 +00:00 committed by commit-bot@chromium.org
parent cefe4d5d65
commit 1969314cde
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkg/kernel/lib/transformations/precompiler.dart
View file

@ -13,6 +13,7 @@ import '../ast.dart'
Library,
Member,
MethodInvocation,
Name,
Procedure,
Program,
PropertyGet,
@ -28,7 +29,7 @@ import '../visitor.dart' show Transformer;
/// Performs whole-program transformations for Dart VM precompiler.
/// Assumes strong mode and closed world.
Program transformProgram(CoreTypes coreTypes, Program program) {
new _DevirtualizationTransformer(program).visitProgram(program);
new _DevirtualizationTransformer(coreTypes, program).visitProgram(program);
return program;
}
@ -38,10 +39,15 @@ class _DevirtualizationTransformer extends Transformer {
/// Toggles tracing (useful for debugging).
static const _trace = const bool.fromEnvironment('trace.devirtualization');
ClosedWorldClassHierarchy _hierarchy;
final ClosedWorldClassHierarchy _hierarchy;
Set<Name> _objectMemberNames;
_DevirtualizationTransformer(Program program)
: _hierarchy = new ClosedWorldClassHierarchy(program) {}
_DevirtualizationTransformer(CoreTypes coreTypes, Program program)
: _hierarchy = new ClosedWorldClassHierarchy(program) {
_objectMemberNames = new Set<Name>.from(_hierarchy
.getInterfaceMembers(coreTypes.objectClass)
.map((Member m) => m.name));
}
@override
TreeNode visitLibrary(Library node) {
@ -57,7 +63,9 @@ class _DevirtualizationTransformer extends Transformer {
node = super.visitMethodInvocation(node);
Member target = node.interfaceTarget;
if ((target != null) && (target is! Field)) {
if ((target != null) &&
(target is! Field) &&
!_objectMemberNames.contains(target.name)) {
Member singleTarget =
_hierarchy.getSingleTargetForInterfaceInvocation(target);
if ((singleTarget is Procedure) && !singleTarget.isGetter) {
@ -78,7 +86,7 @@ class _DevirtualizationTransformer extends Transformer {
node = super.visitPropertyGet(node);
Member target = node.interfaceTarget;
if (target != null) {
if ((target != null) && !_objectMemberNames.contains(target.name)) {
Member singleTarget =
_hierarchy.getSingleTargetForInterfaceInvocation(target);
if (singleTarget != null) {