| Index: src/isolate.cc
|
| diff --git a/src/isolate.cc b/src/isolate.cc
|
| index afb9624875cc2756c0edb7f25d1c84138870bac2..fd0f673e7ec1175ab82413e5ea3ea07ee3d3fa30 100644
|
| --- a/src/isolate.cc
|
| +++ b/src/isolate.cc
|
| @@ -1414,7 +1414,7 @@ Isolate::Isolate()
|
| TRACE_ISOLATE(constructor);
|
|
|
| memset(isolate_addresses_, 0,
|
| - sizeof(isolate_addresses_[0]) * (k_isolate_address_count + 1));
|
| + sizeof(isolate_addresses_[0]) * (kIsolateAddressCount + 1));
|
|
|
| heap_.isolate_ = this;
|
| zone_.isolate_ = this;
|
| @@ -1686,9 +1686,10 @@ bool Isolate::Init(Deserializer* des) {
|
| // ensuring that Isolate::Current() == this.
|
| heap_.SetStackLimits();
|
|
|
| -#define C(name) isolate_addresses_[Isolate::k_##name] = \
|
| - reinterpret_cast<Address>(name());
|
| - ISOLATE_ADDRESS_LIST(C)
|
| +#define ASSIGN_ELEMENT(CamelName, hacker_name) \
|
| + isolate_addresses_[Isolate::k##CamelName##Address] = \
|
| + reinterpret_cast<Address>(hacker_name##_address());
|
| + FOR_EACH_ISOLATE_ADDRESS_NAME(ASSIGN_ELEMENT)
|
| #undef C
|
|
|
| string_tracker_ = new StringTracker();
|
|
|