| Index: src/hydrogen-instructions.cc
|
| diff --git a/src/hydrogen-instructions.cc b/src/hydrogen-instructions.cc
|
| index 70e2395574747085a8a554cc0a84d00eecd81390..f584ec4e6725bdb9f768d19e6b266bdc81021298 100644
|
| --- a/src/hydrogen-instructions.cc
|
| +++ b/src/hydrogen-instructions.cc
|
| @@ -3507,14 +3507,7 @@ void HPhi::SimplifyConstantInputs() {
|
|
|
| void HPhi::InferRepresentation(HInferRepresentation* h_infer) {
|
| ASSERT(CheckFlag(kFlexibleRepresentation));
|
| - // If there are non-Phi uses, and all of them have observed the same
|
| - // representation, than that's what this Phi is going to use.
|
| - Representation new_rep = RepresentationObservedByAllNonPhiUses();
|
| - if (!new_rep.IsNone()) {
|
| - UpdateRepresentation(new_rep, h_infer, "unanimous use observations");
|
| - return;
|
| - }
|
| - new_rep = RepresentationFromInputs();
|
| + Representation new_rep = RepresentationFromInputs();
|
| UpdateRepresentation(new_rep, h_infer, "inputs");
|
| new_rep = RepresentationFromUses();
|
| UpdateRepresentation(new_rep, h_infer, "uses");
|
| @@ -3523,22 +3516,6 @@ void HPhi::InferRepresentation(HInferRepresentation* h_infer) {
|
| }
|
|
|
|
|
| -Representation HPhi::RepresentationObservedByAllNonPhiUses() {
|
| - int non_phi_use_count = 0;
|
| - for (int i = Representation::kInteger32;
|
| - i < Representation::kNumRepresentations; ++i) {
|
| - non_phi_use_count += non_phi_uses_[i];
|
| - }
|
| - if (non_phi_use_count <= 1) return Representation::None();
|
| - for (int i = 0; i < Representation::kNumRepresentations; ++i) {
|
| - if (non_phi_uses_[i] == non_phi_use_count) {
|
| - return Representation::FromKind(static_cast<Representation::Kind>(i));
|
| - }
|
| - }
|
| - return Representation::None();
|
| -}
|
| -
|
| -
|
| Representation HPhi::RepresentationFromInputs() {
|
| bool double_occurred = false;
|
| bool int32_occurred = false;
|
|
|