[turbofan] Fix bad merge.

TBR=bmeurer@chromium.org

Review-Url: https://codereview.chromium.org/2057063002
Cr-Commit-Position: refs/heads/master@{#36886}
This commit is contained in:
jarin 2016-06-10 03:40:31 -07:00 committed by Commit bot
parent 85882a6320
commit b4274ce38e

View File

@ -454,6 +454,7 @@ bool EffectControlLinearizer::TryWireInStateEffect(Node* node,
break;
case IrOpcode::kCheckIf:
state = LowerCheckIf(node, frame_state, *effect, *control);
break;
case IrOpcode::kPlainPrimitiveToNumber:
state = LowerPlainPrimitiveToNumber(node, *effect, *control);
break;