Bug 898451 - IonMonkey: Don't allocate static storage for id_count in non-DEBUG mode. r=nbp

This commit is contained in:
Dan Gohman 2013-07-30 21:12:58 -07:00
Родитель 865a6efa46
Коммит 60e46e3b3c
2 изменённых файлов: 2 добавлений и 8 удалений

Просмотреть файл

@ -2413,8 +2413,6 @@ AutoFlushInhibitor::~AutoFlushInhibitor()
IonSpewCont(IonSpew_CacheFlush, "{"); IonSpewCont(IonSpew_CacheFlush, "{");
} }
int js::ion::LabelBase::id_count = 0;
void void
ion::PurgeCaches(JSScript *script, Zone *zone) ion::PurgeCaches(JSScript *script, Zone *zone)
{ {

Просмотреть файл

@ -7,7 +7,6 @@
#ifndef ion_shared_Assembler_shared_h #ifndef ion_shared_Assembler_shared_h
#define ion_shared_Assembler_shared_h #define ion_shared_Assembler_shared_h
#include "mozilla/DebugOnly.h"
#include "mozilla/PodOperations.h" #include "mozilla/PodOperations.h"
#include <limits.h> #include <limits.h>
@ -202,17 +201,14 @@ struct LabelBase
// Disallow assignment. // Disallow assignment.
void operator =(const LabelBase &label); void operator =(const LabelBase &label);
static int id_count;
public: public:
mozilla::DebugOnly <int> id;
static const int32_t INVALID_OFFSET = -1; static const int32_t INVALID_OFFSET = -1;
LabelBase() : offset_(INVALID_OFFSET), bound_(false), id(id_count++) LabelBase() : offset_(INVALID_OFFSET), bound_(false)
{ } { }
LabelBase(const LabelBase &label) LabelBase(const LabelBase &label)
: offset_(label.offset_), : offset_(label.offset_),
bound_(label.bound_), bound_(label.bound_)
id(id_count++)
{ } { }
// If the label is bound, all incoming edges have been patched and any // If the label is bound, all incoming edges have been patched and any