From d31340f90f9663d0ce8b5ba5878677dbe5cb63aa Mon Sep 17 00:00:00 2001 From: Brian Hackett Date: Sat, 26 Mar 2011 20:34:56 -0700 Subject: [PATCH] [INFER] Fix Linux build again. --- js/src/methodjit/Retcon.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/methodjit/Retcon.cpp b/js/src/methodjit/Retcon.cpp index 4b96f77c9e2..c05b277830b 100644 --- a/js/src/methodjit/Retcon.cpp +++ b/js/src/methodjit/Retcon.cpp @@ -315,7 +315,7 @@ Recompiler::expandInlineFrames(JSContext *cx, JSStackFrame *fp, mjit::CallSite * if (next) { next->resetInlinePrev(innerfp, innerpc); void **addr = next->addressOfNativeReturnAddress(); - if (*addr != NULL && *addr != (void *) JaegerTrampolineReturn) { + if (*addr != NULL && *addr != JS_FUNC_TO_DATA_PTR(void *, JaegerTrampolineReturn)) { PatchableAddress patch; patch.location = addr; patch.callSite.initialize(0, uint32(-1), inlined->pcOffset, CallSite::NCODE_RETURN_ID); @@ -461,7 +461,7 @@ Recompiler::recompile() if (!*addr) { // next is an interpreted frame. - } else if (*addr == (void *) JaegerTrampolineReturn) { + } else if (*addr == JS_FUNC_TO_DATA_PTR(void *, JaegerTrampolineReturn)) { // next entered from the interpreter. } else if (fp->isConstructing()) { JS_ASSERT(script->jitCtor && script->jitCtor->isValidCode(*addr));