| Index: pkg/compiler/lib/src/ssa/ssa_branch_builder.dart
|
| diff --git a/pkg/compiler/lib/src/ssa/ssa_branch_builder.dart b/pkg/compiler/lib/src/ssa/ssa_branch_builder.dart
|
| index c0dfa0b15f94b7c580a8550deee56abcb66e53c4..b34552cd652591ffaefaea2a21867ba4d16fc973 100644
|
| --- a/pkg/compiler/lib/src/ssa/ssa_branch_builder.dart
|
| +++ b/pkg/compiler/lib/src/ssa/ssa_branch_builder.dart
|
| @@ -161,8 +161,7 @@ class SsaBranchBuilder {
|
| boolifiedLeft = builder.popBoolified();
|
| builder.stack.add(boolifiedLeft);
|
| if (!isAnd) {
|
| - JavaScriptBackend backend = compiler.backend;
|
| - builder.push(new HNot(builder.pop(), backend.boolType));
|
| + builder.push(new HNot(builder.pop(), builder.commonMasks.boolType));
|
| }
|
| }
|
|
|
| @@ -173,9 +172,10 @@ class SsaBranchBuilder {
|
|
|
| handleIf(visitCondition, visitThen, null);
|
| HConstant notIsAnd = builder.graph.addConstantBool(!isAnd, compiler);
|
| - JavaScriptBackend backend = compiler.backend;
|
| HPhi result = new HPhi.manyInputs(
|
| - null, <HInstruction>[boolifiedRight, notIsAnd], backend.dynamicType);
|
| + null,
|
| + <HInstruction>[boolifiedRight, notIsAnd],
|
| + builder.commonMasks.dynamicType);
|
| builder.current.addPhi(result);
|
| builder.stack.add(result);
|
| }
|
| @@ -200,9 +200,8 @@ class SsaBranchBuilder {
|
|
|
| if (isExpression) {
|
| assert(thenValue != null && elseValue != null);
|
| - JavaScriptBackend backend = compiler.backend;
|
| - HPhi phi = new HPhi.manyInputs(
|
| - null, <HInstruction>[thenValue, elseValue], backend.dynamicType);
|
| + HPhi phi = new HPhi.manyInputs(null, <HInstruction>[thenValue, elseValue],
|
| + builder.commonMasks.dynamicType);
|
| joinBranch.block.addPhi(phi);
|
| builder.stack.add(phi);
|
| }
|
|
|