Index: test/cctest/compiler/code-assembler-tester.h |
diff --git a/test/cctest/compiler/code-assembler-tester.h b/test/cctest/compiler/code-assembler-tester.h |
index 1e3c58f453f7b3fa2184943a54eb1d161e7fb35b..ac663b30dcb020aec62b53987b9679e0defada61 100644 |
--- a/test/cctest/compiler/code-assembler-tester.h |
+++ b/test/cctest/compiler/code-assembler-tester.h |
@@ -14,11 +14,11 @@ namespace compiler { |
class ZoneHolder { |
public: |
explicit ZoneHolder(Isolate* isolate) |
- : zone_(isolate->allocator(), ZONE_NAME) {} |
- Zone* zone() { return &zone_; } |
+ : held_zone_(isolate->allocator(), ZONE_NAME) {} |
+ Zone* held_zone() { return &held_zone_; } |
private: |
- Zone zone_; |
+ Zone held_zone_; |
}; |
// Inherit from ZoneHolder in order to create a zone that can be passed to |
@@ -30,14 +30,14 @@ class CodeAssemblerTesterImpl : private ZoneHolder, public CodeAssemblerT { |
CodeAssemblerTesterImpl(Isolate* isolate, |
const CallInterfaceDescriptor& descriptor) |
: ZoneHolder(isolate), |
- CodeAssemblerT(isolate, ZoneHolder::zone(), descriptor, |
+ CodeAssemblerT(isolate, ZoneHolder::held_zone(), descriptor, |
Code::ComputeFlags(Code::STUB), "test"), |
scope_(isolate) {} |
// Test generating code for a JS function (e.g. builtins). |
CodeAssemblerTesterImpl(Isolate* isolate, int parameter_count) |
: ZoneHolder(isolate), |
- CodeAssemblerT(isolate, ZoneHolder::zone(), parameter_count, |
+ CodeAssemblerT(isolate, ZoneHolder::held_zone(), parameter_count, |
Code::ComputeFlags(Code::FUNCTION), "test"), |
scope_(isolate) {} |
@@ -45,7 +45,7 @@ class CodeAssemblerTesterImpl : private ZoneHolder, public CodeAssemblerT { |
// specific flags. |
CodeAssemblerTesterImpl(Isolate* isolate, Code::Flags flags) |
: ZoneHolder(isolate), |
- CodeAssemblerT(isolate, ZoneHolder::zone(), 0, flags, "test"), |
+ CodeAssemblerT(isolate, ZoneHolder::held_zone(), 0, flags, "test"), |
scope_(isolate) {} |
Handle<Code> GenerateCodeCloseAndEscape() { |