wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1150714 - Fix streaming tracked optimizations for functions that don't have a displayAtom. (r=djvj)

Browse Source
This commit is contained in:
Shu-yu Guo 2015-04-06 18:38:31 -07:00
parent f1b9a9dacc
commit 7f4efc338e
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/jit/OptimizationTracking.cpp
View File

@ -1213,11 +1213,14 @@ IonTrackedOptimizationsTypeInfo::ForEachOpAdapter::readType(const IonTrackedType
return;
}
PutEscapedString(buf, bufsize, fun->displayAtom(), 0);
if (fun->displayAtom())
PutEscapedString(buf, bufsize, fun->displayAtom(), 0);
const char* filename;
unsigned lineno;
InterpretedFunctionFilenameAndLineNumber(fun, &filename, &lineno);
op_.readType(tracked.constructor ? "constructor" : "function", buf, filename, lineno);
op_.readType(tracked.constructor ? "constructor" : "function",
fun->displayAtom() ? buf : nullptr,
filename, lineno);
return;
}

6
tools/profiler/ProfileEntry.cpp
View File

@ -231,8 +231,8 @@ public:
, mStartedTypeList(false)
{ }
void readType(const char *keyedBy, const char *name,
const char *location, unsigned lineno) override {
void readType(const char* keyedBy, const char* name,
const char* location, unsigned lineno) override {
if (!mStartedTypeList) {
mStartedTypeList = true;
mWriter.BeginObject();
@ -254,7 +254,7 @@ public:
mWriter.EndObject();
}
void operator()(JS::TrackedTypeSite site, const char *mirType) override {
void operator()(JS::TrackedTypeSite site, const char* mirType) override {
if (mStartedTypeList) {
mWriter.EndArray();
mStartedTypeList = false;