From 3c96821add691cfe352031057bc3526a612e8bbe Mon Sep 17 00:00:00 2001 From: Douglas Crosher Date: Fri, 19 Jul 2013 20:42:38 +1000 Subject: [PATCH] Bug 895830 - OdinMonkey: fix compilation of the perf spewer support. r=luke --- js/src/ion/AsmJS.cpp | 8 ++++---- js/src/ion/AsmJSLink.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/js/src/ion/AsmJS.cpp b/js/src/ion/AsmJS.cpp index 4f50c0666e11..c944a5b66146 100644 --- a/js/src/ion/AsmJS.cpp +++ b/js/src/ion/AsmJS.cpp @@ -1452,14 +1452,14 @@ class MOZ_STACK_CLASS ModuleCompiler #ifdef JS_ION_PERF bool trackPerfProfiledFunction(const Func &func, unsigned endCodeOffset) { unsigned lineno = 0U, columnIndex = 0U; - tokenStream_.srcCoords.lineNumAndColumnIndex(func.srcOffset(), &lineno, &columnIndex); + parser().tokenStream.srcCoords.lineNumAndColumnIndex(func.srcOffset(), &lineno, &columnIndex); - unsigned startCodeOffset = func.codeLabel()->offset(); + unsigned startCodeOffset = func.code()->offset(); return module_->trackPerfProfiledFunction(func.name(), startCodeOffset, endCodeOffset, lineno, columnIndex); } bool trackPerfProfiledBlocks(AsmJSPerfSpewer &perfSpewer, const Func &func, unsigned endCodeOffset) { - unsigned startCodeOffset = func.codeLabel()->offset(); + unsigned startCodeOffset = func.code()->offset(); perfSpewer.noteBlocksOffsets(masm_); return module_->trackPerfProfiledBlocks(func.name(), startCodeOffset, endCodeOffset, perfSpewer.basicBlocks()); } @@ -4788,7 +4788,7 @@ GenerateCode(ModuleCompiler &m, ModuleCompiler::Func &func, MIRGenerator &mir, L #ifdef JS_ION_PERF if (PerfBlockEnabled()) { - if (!m.trackPerfProfiledBlocks(mirGen.perfSpewer(), func, m.masm().size())) + if (!m.trackPerfProfiledBlocks(mir.perfSpewer(), func, m.masm().size())) return false; } else if (PerfFuncEnabled()) { if (!m.trackPerfProfiledFunction(func, m.masm().size())) diff --git a/js/src/ion/AsmJSLink.cpp b/js/src/ion/AsmJSLink.cpp index f5ee7174c721..8393f472ec67 100644 --- a/js/src/ion/AsmJSLink.cpp +++ b/js/src/ion/AsmJSLink.cpp @@ -492,7 +492,7 @@ SendFunctionsToPerf(JSContext *cx, AsmJSModule &module) unsigned long base = (unsigned long) module.functionCode(); const AsmJSModule::PostLinkFailureInfo &info = module.postLinkFailureInfo(); - const char *filename = const_cast(info.scriptSource_->filename()); + const char *filename = const_cast(info.scriptSource->filename()); for (unsigned i = 0; i < module.numPerfFunctions(); i++) { const AsmJSModule::ProfiledFunction &func = module.perfProfiledFunction(i); @@ -527,7 +527,7 @@ SendBlocksToPerf(JSContext *cx, AsmJSModule &module) unsigned long funcBaseAddress = (unsigned long) module.functionCode(); const AsmJSModule::PostLinkFailureInfo &info = module.postLinkFailureInfo(); - const char *filename = const_cast(info.scriptSource_->filename()); + const char *filename = const_cast(info.scriptSource->filename()); for (unsigned i = 0; i < module.numPerfBlocksFunctions(); i++) { const AsmJSModule::ProfiledBlocksFunction &func = module.perfProfiledBlocksFunction(i);