From 6afe5553b07eee6e29b4714a81bde363e763260c Mon Sep 17 00:00:00 2001 From: "plind44@gmail.com" Date: Fri, 6 Dec 2013 14:14:32 +0000 Subject: [PATCH] MIPS: Fix compilation with clang. Port r18267 (12a613f) BUG= R=gergely@homejinni.com Review URL: https://codereview.chromium.org/98403003 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18268 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/mips/codegen-mips.cc | 3 ++- src/mips/stub-cache-mips.cc | 9 +++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/mips/codegen-mips.cc b/src/mips/codegen-mips.cc index 229cc0b..2c75658 100644 --- a/src/mips/codegen-mips.cc +++ b/src/mips/codegen-mips.cc @@ -600,9 +600,10 @@ void MathExpGenerator::EmitMathExp(MacroAssembler* masm, __ bind(&done); } - +#ifdef DEBUG // nop(CODE_AGE_MARKER_NOP) static const uint32_t kCodeAgePatchFirstInstruction = 0x00010180; +#endif static byte* GetNoCodeAgeSequence(uint32_t* length) { // The sequence of instructions that is patched out for aging code is the diff --git a/src/mips/stub-cache-mips.cc b/src/mips/stub-cache-mips.cc index 6c38e90..0db010e 100644 --- a/src/mips/stub-cache-mips.cc +++ b/src/mips/stub-cache-mips.cc @@ -915,12 +915,10 @@ class CallInterceptorCompiler BASE_EMBEDDED { public: CallInterceptorCompiler(CallStubCompiler* stub_compiler, const ParameterCount& arguments, - Register name, - ExtraICState extra_ic_state) + Register name) : stub_compiler_(stub_compiler), arguments_(arguments), - name_(name), - extra_ic_state_(extra_ic_state) {} + name_(name) {} void Compile(MacroAssembler* masm, Handle object, @@ -1095,7 +1093,6 @@ class CallInterceptorCompiler BASE_EMBEDDED { CallStubCompiler* stub_compiler_; const ParameterCount& arguments_; Register name_; - ExtraICState extra_ic_state_; }; @@ -2463,7 +2460,7 @@ Handle CallStubCompiler::CompileCallInterceptor(Handle object, // Get the receiver from the stack. __ lw(a1, MemOperand(sp, argc * kPointerSize)); - CallInterceptorCompiler compiler(this, arguments(), a2, extra_state()); + CallInterceptorCompiler compiler(this, arguments(), a2); compiler.Compile(masm(), object, holder, name, &lookup, a1, a3, t0, a0, &miss); -- 2.7.4