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

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

Issue 11418132: Revert r15265 due to checked mode failures. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 1 month 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 | « sdk/lib/_internal/compiler/implementation/ssa/nodes.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/_internal/compiler/implementation/ssa/optimize.dart
===================================================================
--- sdk/lib/_internal/compiler/implementation/ssa/optimize.dart (revision 15268)
+++ sdk/lib/_internal/compiler/implementation/ssa/optimize.dart (working copy)
@@ -211,22 +211,6 @@
&& node.selector.name == const SourceString('toString')) {
return node.inputs[1];
}
- // Check if this call does not need to be intercepted.
- HType type = types[input];
- var interceptor = node.inputs[0];
- if (node is HInvokeDynamicMethod
- && interceptor is !HThis
- && !type.canBePrimitive()) {
- // If the type can be null, and the intercepted method can be in
- // the object class, keep the interceptor.
- if (type.canBeNull()
- && interceptor.interceptedClasses.contains(compiler.objectClass)) {
- return node;
- }
- // Change the call to a regular invoke dynamic call.
- return new HInvokeDynamicMethod(
- node.selector, node.inputs.getRange(1, node.inputs.length - 1));
- }
return node;
}
@@ -266,8 +250,8 @@
return node;
}
- HInstruction fromNativeToDynamicInvocation(HInvokeStatic node,
- Selector selector) {
+ HInstruction fromInterceptorToDynamicInvocation(HInvokeStatic node,
+ Selector selector) {
HBoundedType type = types[node.inputs[1]];
HInvokeDynamicMethod result = new HInvokeDynamicMethod(
selector,
@@ -297,7 +281,7 @@
HInstruction visitIndex(HIndex node) {
if (!node.receiver.canBePrimitive(types)) {
Selector selector = new Selector.index();
- return fromNativeToDynamicInvocation(node, selector);
+ return fromInterceptorToDynamicInvocation(node, selector);
}
return node;
}
@@ -305,7 +289,7 @@
HInstruction visitIndexAssign(HIndexAssign node) {
if (!node.receiver.canBePrimitive(types)) {
Selector selector = new Selector.indexSet();
- return fromNativeToDynamicInvocation(node, selector);
+ return fromInterceptorToDynamicInvocation(node, selector);
}
return node;
}
@@ -326,7 +310,7 @@
// The equals operation is being optimized in visitEquals.
&& node is! HEquals) {
Selector selector = new Selector.binaryOperator(operation.name);
- return fromNativeToDynamicInvocation(node, selector);
+ return fromInterceptorToDynamicInvocation(node, selector);
}
return node;
}
@@ -672,38 +656,6 @@
}
return graph.addConstant(constantSystem.createString(folded, node.node));
}
-
- HInstruction visitInterceptor(HInterceptor node) {
- if (node.isConstant()) return node;
- HType type = types[node.inputs[0]];
- Element constantInterceptor;
- if (type.isInteger()) {
- constantInterceptor = backend.intInterceptor;
- } else if (type.isDouble()) {
- constantInterceptor = backend.doubleInterceptor;
- } else if (type.isBoolean()) {
- constantInterceptor = backend.boolInterceptor;
- } else if (type.isString()) {
- constantInterceptor = backend.stringInterceptor;
- } else if (type.isArray()) {
- constantInterceptor = backend.arrayInterceptor;
- } else if (type.isNull()) {
- constantInterceptor = backend.nullInterceptor;
- } else if (type.isNumber()) {
- Set<ClassElement> intercepted = node.interceptedClasses;
- // If the method being intercepted is not defined in [int] or
- // [double] we can safely use the number interceptor.
- if (!intercepted.contains(compiler.intClass)
- && !intercepted.contains(compiler.doubleClass)) {
- constantInterceptor = backend.numberInterceptor;
- }
- }
-
- if (constantInterceptor == null) return node;
-
- ConstantHandler handler = compiler.constantHandler;
- return graph.addConstant(handler.compileVariable(constantInterceptor));
- }
}
class SsaCheckInserter extends HBaseVisitor implements OptimizationPhase {
« no previous file with comments | « sdk/lib/_internal/compiler/implementation/ssa/nodes.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698