| Index: src/hydrogen-instructions.cc
|
| diff --git a/src/hydrogen-instructions.cc b/src/hydrogen-instructions.cc
|
| index 887e80afc43789725a11b0bea7d78d5bf13f42cd..ee45ae5105a8bb5185ca1d765d13ab595a64b81e 100644
|
| --- a/src/hydrogen-instructions.cc
|
| +++ b/src/hydrogen-instructions.cc
|
| @@ -416,18 +416,18 @@ void HValue::PrintRangeTo(StringStream* stream) {
|
|
|
|
|
| void HValue::PrintChangesTo(StringStream* stream) {
|
| - int changes_flags = ChangesFlags();
|
| - if (changes_flags == 0) return;
|
| + GVNFlagSet changes_flags = ChangesFlags();
|
| + if (changes_flags.IsEmpty()) return;
|
| stream->Add(" changes[");
|
| - if (changes_flags == AllSideEffects()) {
|
| + if (changes_flags == AllSideEffectsFlagSet()) {
|
| stream->Add("*");
|
| } else {
|
| bool add_comma = false;
|
| -#define PRINT_DO(type) \
|
| - if (changes_flags & (1 << kChanges##type)) { \
|
| - if (add_comma) stream->Add(","); \
|
| - add_comma = true; \
|
| - stream->Add(#type); \
|
| +#define PRINT_DO(type) \
|
| + if (changes_flags.Contains(kChanges##type)) { \
|
| + if (add_comma) stream->Add(","); \
|
| + add_comma = true; \
|
| + stream->Add(#type); \
|
| }
|
| GVN_FLAG_LIST(PRINT_DO);
|
| #undef PRINT_DO
|
| @@ -1408,7 +1408,7 @@ HLoadNamedFieldPolymorphic::HLoadNamedFieldPolymorphic(HValue* context,
|
| SetOperandAt(0, context);
|
| SetOperandAt(1, object);
|
| set_representation(Representation::Tagged());
|
| - SetFlag(kDependsOnMaps);
|
| + SetGVNFlag(kDependsOnMaps);
|
| for (int i = 0;
|
| i < types->length() && types_.length() < kMaxLoadPolymorphism;
|
| ++i) {
|
| @@ -1420,9 +1420,9 @@ HLoadNamedFieldPolymorphic::HLoadNamedFieldPolymorphic(HValue* context,
|
| case FIELD: {
|
| int index = lookup.GetLocalFieldIndexFromMap(*map);
|
| if (index < 0) {
|
| - SetFlag(kDependsOnInobjectFields);
|
| + SetGVNFlag(kDependsOnInobjectFields);
|
| } else {
|
| - SetFlag(kDependsOnBackingStoreFields);
|
| + SetGVNFlag(kDependsOnBackingStoreFields);
|
| }
|
| types_.Add(types->at(i));
|
| break;
|
|
|