From 74a06647ccf4e36c9038488a1ce2048701ee7e6a Mon Sep 17 00:00:00 2001 From: "palfia@homejinni.com" Date: Tue, 4 Jun 2013 20:14:37 +0000 Subject: [PATCH] MIPS: Deprecate FACTORY helper macro. Port r14931 (a914442) Original commit message: This removes the FACTORY helper macro to avoid accidental TLS access when using the factory. Most internal code has access to the Isolate by now whereas tests which are not performance critical still heavily use TLS access through explicit Isolate::Current() calls. BUG= Review URL: https://codereview.chromium.org/15994011 Patch from Balazs Kilvady . git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14942 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/mips/code-stubs-mips.cc | 2 +- src/mips/full-codegen-mips.cc | 2 +- src/mips/regexp-macro-assembler-mips.cc | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc index 3333213e62..11bf302f59 100644 --- a/src/mips/code-stubs-mips.cc +++ b/src/mips/code-stubs-mips.cc @@ -961,7 +961,7 @@ static void EmitIdenticalObjectComparison(MacroAssembler* masm, __ li(exp_mask_reg, Operand(HeapNumber::kExponentMask)); - // Test for NaN. Sadly, we can't just compare to factory->nan_value(), + // Test for NaN. Sadly, we can't just compare to Factory::nan_value(), // so we do the second best thing - test it ourselves. // They are both equal and they are not both Smis so both of them are not // Smis. If it's not a heap number, then return equal. diff --git a/src/mips/full-codegen-mips.cc b/src/mips/full-codegen-mips.cc index 78f44ab23e..fa85da680f 100644 --- a/src/mips/full-codegen-mips.cc +++ b/src/mips/full-codegen-mips.cc @@ -3039,7 +3039,7 @@ void FullCodeGenerator::EmitIsStringWrapperSafeForDefaultValueOf( // string "valueOf" the result is false. // The use of t2 to store the valueOf string assumes that it is not otherwise // used in the loop below. - __ li(t2, Operand(FACTORY->value_of_string())); + __ li(t2, Operand(isolate()->factory()->value_of_string())); __ jmp(&entry); __ bind(&loop); __ lw(a3, MemOperand(t0, 0)); diff --git a/src/mips/regexp-macro-assembler-mips.cc b/src/mips/regexp-macro-assembler-mips.cc index 7289296d56..3e255b7d80 100644 --- a/src/mips/regexp-macro-assembler-mips.cc +++ b/src/mips/regexp-macro-assembler-mips.cc @@ -929,9 +929,8 @@ Handle RegExpMacroAssemblerMIPS::GetCode(Handle source) { CodeDesc code_desc; masm_->GetCode(&code_desc); - Handle code = FACTORY->NewCode(code_desc, - Code::ComputeFlags(Code::REGEXP), - masm_->CodeObject()); + Handle code = isolate()->factory()->NewCode( + code_desc, Code::ComputeFlags(Code::REGEXP), masm_->CodeObject()); LOG(Isolate::Current(), RegExpCodeCreateEvent(*code, *source)); return Handle::cast(code); }