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

Unified Diff: dart/frog/leg/ssa/codegen.dart

Issue 9429047: Implement operator-is for interfaces' supertypes and String's supertypes. Also, improve stack trace… (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge
Patch Set: rebased Created 8 years, 10 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 | « dart/frog/leg/lib/js_helper.dart ('k') | dart/tests/co19/co19-leg.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dart/frog/leg/ssa/codegen.dart
diff --git a/dart/frog/leg/ssa/codegen.dart b/dart/frog/leg/ssa/codegen.dart
index 0e688881169e6052bb0cc3ba3b373d4ac42ec561..851f500e80022ab9c7ef949960e8f47f4f520206 100644
--- a/dart/frog/leg/ssa/codegen.dart
+++ b/dart/frog/leg/ssa/codegen.dart
@@ -715,8 +715,12 @@ class SsaCodeGenerator implements HVisitor {
}
visitThrow(HThrow node) {
- buffer.add('throw ');
- use(node.inputs[0], JSPrecedence.EXPRESSION_PRECEDENCE);
+ // Make sure that the toString interceptor is emitted so the JS
+ // toString method can call it.
+ Element toStringHelper =
+ compiler.findHelper(new SourceString(@'builtin$toString$0'));
+ compiler.registerStaticUse(toStringHelper);
+ generateThrowWithHelper('captureStackTrace', node.inputs[0]);
buffer.add(';\n');
}
@@ -728,7 +732,7 @@ class SsaCodeGenerator implements HVisitor {
buffer.add(' >= ');
use(node.length, JSPrecedence.SHIFT_PRECEDENCE);
buffer.add(") ");
- generateFail('ioore', node.index);
+ generateThrowWithHelper('ioore', node.index);
}
visitIntegerCheck(HIntegerCheck node) {
@@ -737,10 +741,10 @@ class SsaCodeGenerator implements HVisitor {
buffer.add(' !== (');
use(node.value, JSPrecedence.BITWISE_OR_PRECEDENCE);
buffer.add(" | 0)) ");
- generateFail('iae', node.value);
+ generateThrowWithHelper('iae', node.value);
}
- void generateFail(String helperName, HInstruction argument) {
+ void generateThrowWithHelper(String helperName, HInstruction argument) {
Element helper = compiler.findHelper(new SourceString(helperName));
compiler.registerStaticUse(helper);
buffer.add('throw ');
@@ -924,16 +928,18 @@ class SsaCodeGenerator implements HVisitor {
endExpression(JSPrecedence.LOGICAL_AND_PRECEDENCE);
} else {
beginExpression(JSPrecedence.LOGICAL_AND_PRECEDENCE);
+ if (isStringSupertype(element)) {
+ checkString(input, '===');
+ buffer.add(' || ');
+ }
checkObject(input, '===');
buffer.add(' && ');
int precedence = JSPrecedence.PREFIX_PRECEDENCE;
bool endParen = false;
- if (element == coreLibrary.find(const SourceString('List'))) {
+ if (isListOrSupertype(element)) {
buffer.add("(");
endParen = true;
- beginExpression(JSPrecedence.LOGICAL_AND_PRECEDENCE);
- checkObject(input, '===');
- buffer.add(' && ');
+ beginExpression(JSPrecedence.LOGICAL_OR_PRECEDENCE);
checkArray(input, '===');
buffer.add(' || ');
precedence = JSPrecedence.LOGICAL_OR_PRECEDENCE;
@@ -949,6 +955,20 @@ class SsaCodeGenerator implements HVisitor {
endExpression(JSPrecedence.LOGICAL_AND_PRECEDENCE);
}
}
+
+ bool isStringSupertype(ClassElement cls) {
+ LibraryElement coreLibrary = compiler.coreLibrary;
+ return (cls == coreLibrary.find(const SourceString('Comparable')))
+ || (cls == coreLibrary.find(const SourceString('Hashable')))
+ || (cls == coreLibrary.find(const SourceString('Pattern')));
+ }
+
+ bool isListOrSupertype(ClassElement cls) {
+ LibraryElement coreLibrary = compiler.coreLibrary;
+ return (cls == coreLibrary.find(const SourceString('List')))
+ || (cls == coreLibrary.find(const SourceString('Collection')))
+ || (cls == coreLibrary.find(const SourceString('Iterable')));
+ }
}
class SsaOptimizedCodeGenerator extends SsaCodeGenerator {
« no previous file with comments | « dart/frog/leg/lib/js_helper.dart ('k') | dart/tests/co19/co19-leg.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698