Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Unified Diff: sdk/lib/_internal/compiler/implementation/ssa/builder.dart

Issue 15689002: Do the null deref guard before doing inlining, especially before doing type checks on the parameter… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tests/language/issue10783_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/_internal/compiler/implementation/ssa/builder.dart
===================================================================
--- sdk/lib/_internal/compiler/implementation/ssa/builder.dart (revision 22983)
+++ sdk/lib/_internal/compiler/implementation/ssa/builder.dart (working copy)
@@ -1320,16 +1320,16 @@
}
assert(canBeInlined);
- InliningState state = enterInlinedMethod(
- function, selector, argumentsNodes, providedArguments, currentNode);
- // Add an explicit null check on the receiver. We use [element]
- // to get the same name in the NoSuchMethodError message as if we had
- // called it.
+ // Add an explicit null check on the receiver before doing the
+ // inlining. We use [element] to get the same name in the NoSuchMethodError
+ // message as if we had called it.
if (element.isInstanceMember()
&& (selector.mask == null || selector.mask.isNullable)) {
addWithPosition(
new HFieldGet(element, providedArguments[0]), currentNode);
}
+ InliningState state = enterInlinedMethod(
+ function, selector, argumentsNodes, providedArguments, currentNode);
inlinedFrom(element, () {
functionExpression.body.accept(this);
});
« no previous file with comments | « no previous file | tests/language/issue10783_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698