Partially revert r42319 to pacify tests.

I will reconcile UnboxIntConverterInstr::CanDeoptimize and UnboxInt32::CanDeoptimize in a follow up CL.

BUG=

Review URL: https://codereview.chromium.org//805443003

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@42322 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
vegorov@google.com 2014-12-12 16:05:48 +00:00
parent 44b69647a3
commit 4b0428dd83

View file

@ -2065,7 +2065,13 @@ Definition* UnboxIntegerInstr::Canonicalize(FlowGraph* flow_graph) {
box_defn->value()->CopyWithType(),
(representation() == kUnboxedInt32) ?
GetDeoptId() : Isolate::kNoDeoptId);
if ((representation() == kUnboxedInt32) && is_truncating()) {
// TODO(vegorov): marking resulting converter as truncating when
// unboxing can't deoptimize is a workaround for the missing
// deoptimization environment when we insert converter after
// EliminateEnvironments and there is a mismatch between predicates
// UnboxIntConverterInstr::CanDeoptimize and UnboxInt32::CanDeoptimize.
if ((representation() == kUnboxedInt32) &&
(is_truncating() || !CanDeoptimize())) {
converter->mark_truncating();
}
flow_graph->InsertBefore(this, converter, env(), FlowGraph::kValue);