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

Unified Diff: lib/compiler/implementation/ssa/codegen.dart

Issue 10757009: Revert "Allow === and == to generate inputs at the use site when compiling to a single comparison." (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 5 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 | lib/compiler/implementation/ssa/codegen_helpers.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/compiler/implementation/ssa/codegen.dart
diff --git a/lib/compiler/implementation/ssa/codegen.dart b/lib/compiler/implementation/ssa/codegen.dart
index 2ad7d60177420fa375dcc6a9a87284d486efcba4..3b798e90166f124ae332d6251f5e0601ceea7300 100644
--- a/lib/compiler/implementation/ssa/codegen.dart
+++ b/lib/compiler/implementation/ssa/codegen.dart
@@ -1231,35 +1231,45 @@ class SsaCodeGenerator implements HVisitor, HBlockInformationVisitor {
}
void emitIdentityComparison(HInstruction left, HInstruction right) {
- String op = singleIdentityComparison(left, right);
- if (op != null) {
- beginExpression(JSPrecedence.EQUALITY_PRECEDENCE);
- use(left, JSPrecedence.EQUALITY_PRECEDENCE);
- buffer.add(' $op ');
- use(right, JSPrecedence.RELATIONAL_PRECEDENCE);
- endExpression(JSPrecedence.EQUALITY_PRECEDENCE);
- } else {
- assert(NullConstant.JsNull == 'null');
- withPrecedence(JSPrecedence.CONDITIONAL_PRECEDENCE, () {
+ HType leftType = left.propagatedType;
+ HType rightType = right.propagatedType;
+ if (leftType.canBeNull() && rightType.canBeNull()) {
+ if (left.isConstantNull() || right.isConstantNull() ||
+ (leftType.isPrimitive() && leftType == rightType)) {
beginExpression(JSPrecedence.EQUALITY_PRECEDENCE);
use(left, JSPrecedence.EQUALITY_PRECEDENCE);
- buffer.add(' == null');
+ buffer.add(' == ');
+ use(right, JSPrecedence.RELATIONAL_PRECEDENCE);
endExpression(JSPrecedence.EQUALITY_PRECEDENCE);
- buffer.add(' ? ');
- this.expectedPrecedence = JSPrecedence.ASSIGNMENT_PRECEDENCE;
- withPrecedence(JSPrecedence.LOGICAL_AND_PRECEDENCE, () {
- beginExpression(JSPrecedence.EQUALITY_PRECEDENCE);
- use(right, JSPrecedence.EQUALITY_PRECEDENCE);
- buffer.add(' == null');
- endExpression(JSPrecedence.EQUALITY_PRECEDENCE);
- buffer.add(" : ");
+ } else {
+ assert(NullConstant.JsNull == 'null');
+ withPrecedence(JSPrecedence.CONDITIONAL_PRECEDENCE, () {
beginExpression(JSPrecedence.EQUALITY_PRECEDENCE);
use(left, JSPrecedence.EQUALITY_PRECEDENCE);
- buffer.add(' === ');
- use(right, JSPrecedence.EQUALITY_PRECEDENCE);
+ buffer.add(' == null');
endExpression(JSPrecedence.EQUALITY_PRECEDENCE);
+ buffer.add(' ? ');
+ this.expectedPrecedence = JSPrecedence.ASSIGNMENT_PRECEDENCE;
+ withPrecedence(JSPrecedence.LOGICAL_AND_PRECEDENCE, () {
+ beginExpression(JSPrecedence.EQUALITY_PRECEDENCE);
+ use(right, JSPrecedence.EQUALITY_PRECEDENCE);
+ buffer.add(' == null');
+ endExpression(JSPrecedence.EQUALITY_PRECEDENCE);
+ buffer.add(" : ");
+ beginExpression(JSPrecedence.EQUALITY_PRECEDENCE);
+ use(left, JSPrecedence.EQUALITY_PRECEDENCE);
+ buffer.add(' === ');
+ use(right, JSPrecedence.EQUALITY_PRECEDENCE);
+ endExpression(JSPrecedence.EQUALITY_PRECEDENCE);
+ });
});
- });
+ }
+ } else {
+ beginExpression(JSPrecedence.EQUALITY_PRECEDENCE);
+ use(left, JSPrecedence.EQUALITY_PRECEDENCE);
+ buffer.add(' === ');
+ use(right, JSPrecedence.RELATIONAL_PRECEDENCE);
+ endExpression(JSPrecedence.EQUALITY_PRECEDENCE);
}
}
@@ -3105,19 +3115,3 @@ class SsaUnoptimizedCodeGenerator extends SsaCodeGenerator {
}
}
}
-
-String singleIdentityComparison(HInstruction left, HInstruction right) {
- // Returns the single identity comparison (== or ===) or null if a more
- // complex expression is required.
- HType leftType = left.propagatedType;
- HType rightType = right.propagatedType;
- if (leftType.canBeNull() && rightType.canBeNull()) {
- if (left.isConstantNull() || right.isConstantNull() ||
- (leftType.isPrimitive() && leftType == rightType)) {
- return '==';
- }
- return null;
- } else {
- return '===';
- }
-}
« no previous file with comments | « no previous file | lib/compiler/implementation/ssa/codegen_helpers.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698