From b5ee91b55d24bf9f93a3c18c09e925b6f467dac8 Mon Sep 17 00:00:00 2001
From: Douglas Crosher <dtc-moz@scieneer.com>
Date: Tue, 10 Dec 2013 23:31:44 +1100
Subject: [PATCH] Bug 948400 - Fix perf-spewer to use the new accessor methods
 for JSScript uint32/uint16 fields. r=bhackett

---
 js/src/jit/PerfSpewer.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/js/src/jit/PerfSpewer.cpp b/js/src/jit/PerfSpewer.cpp
index ff1da251bcc..6aa38ce05b7 100644
--- a/js/src/jit/PerfSpewer.cpp
+++ b/js/src/jit/PerfSpewer.cpp
@@ -216,7 +216,7 @@ PerfSpewer::writeProfile(JSScript *script,
                     reinterpret_cast<uintptr_t>(code->raw()),
                     size,
                     script->filename(),
-                    script->lineno,
+                    script->lineno(),
                     thisFunctionIndex);
         }
         unlockPerfMap();
@@ -237,7 +237,7 @@ PerfSpewer::writeProfile(JSScript *script,
 
         if (prologueSize > 0) {
             fprintf(PerfFilePtr, "%zx %zx %s:%d: Func%02d-Prologue\n",
-                    funcStart, prologueSize, script->filename(), script->lineno, thisFunctionIndex);
+                    funcStart, prologueSize, script->filename(), script->lineno(), thisFunctionIndex);
         }
 
         uintptr_t cur = funcStart + prologueSize;
@@ -252,7 +252,7 @@ PerfSpewer::writeProfile(JSScript *script,
                 fprintf(PerfFilePtr, "%zx %zx %s:%d: Func%02d-Block?\n",
                         static_cast<uintptr_t>(cur),
                         static_cast<uintptr_t>(blockStart - cur),
-                        script->filename(), script->lineno,
+                        script->filename(), script->lineno(),
                         thisFunctionIndex);
             }
             cur = blockEnd;
@@ -271,7 +271,7 @@ PerfSpewer::writeProfile(JSScript *script,
         if (cur < funcEndInlineCode) {
             fprintf(PerfFilePtr, "%zx %zx %s:%d: Func%02d-Epilogue\n",
                     cur, funcEndInlineCode - cur,
-                    script->filename(), script->lineno,
+                    script->filename(), script->lineno(),
                     thisFunctionIndex);
         }
 
@@ -279,7 +279,7 @@ PerfSpewer::writeProfile(JSScript *script,
         if (funcEndInlineCode < funcEnd) {
             fprintf(PerfFilePtr, "%zx %zx %s:%d: Func%02d-OOL\n",
                     funcEndInlineCode, funcEnd - funcEndInlineCode,
-                    script->filename(), script->lineno,
+                    script->filename(), script->lineno(),
                     thisFunctionIndex);
         }
 
@@ -301,7 +301,7 @@ js::jit::writePerfSpewerBaselineProfile(JSScript *script, IonCode *code)
     if (size > 0) {
         fprintf(PerfFilePtr, "%zx %zx %s:%d: Baseline\n",
                 reinterpret_cast<uintptr_t>(code->raw()),
-                size, script->filename(), script->lineno);
+                size, script->filename(), script->lineno());
     }
 
     unlockPerfMap();