X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/f9bf01c6616d5ddcf65b13b33cedf9e387ff7a63..1df5f87f1309a8daa30dabdee855f48ae40d14ab:/runtime/Identifier.cpp diff --git a/runtime/Identifier.cpp b/runtime/Identifier.cpp index 76e762c..b07341c 100644 --- a/runtime/Identifier.cpp +++ b/runtime/Identifier.cpp @@ -22,50 +22,40 @@ #include "Identifier.h" #include "CallFrame.h" +#include "JSObject.h" +#include "NumericStrings.h" +#include "ScopeChain.h" #include // for placement new #include // for strlen #include #include #include +#include +#include using WTF::ThreadSpecific; namespace JSC { -typedef HashMap, PtrHash > LiteralIdentifierTable; - -class IdentifierTable : public FastAllocBase { -public: - ~IdentifierTable() - { - HashSet::iterator end = m_table.end(); - for (HashSet::iterator iter = m_table.begin(); iter != end; ++iter) - (*iter)->setIsIdentifier(false); - } - - std::pair::iterator, bool> add(UString::Rep* value) - { - std::pair::iterator, bool> result = m_table.add(value); - (*result.first)->setIsIdentifier(true); - return result; - } - - template - std::pair::iterator, bool> add(U value) - { - std::pair::iterator, bool> result = m_table.add(value); - (*result.first)->setIsIdentifier(true); - return result; - } - - void remove(UString::Rep* r) { m_table.remove(r); } - - LiteralIdentifierTable& literalTable() { return m_literalTable; } - -private: - HashSet m_table; - LiteralIdentifierTable m_literalTable; -}; +IdentifierTable::~IdentifierTable() +{ + HashSet::iterator end = m_table.end(); + for (HashSet::iterator iter = m_table.begin(); iter != end; ++iter) + (*iter)->setIsIdentifier(false); +} +std::pair::iterator, bool> IdentifierTable::add(StringImpl* value) +{ + std::pair::iterator, bool> result = m_table.add(value); + (*result.first)->setIsIdentifier(true); + return result; +} +template +std::pair::iterator, bool> IdentifierTable::add(U value) +{ + std::pair::iterator, bool> result = m_table.add(value); + (*result.first)->setIsIdentifier(true); + return result; +} IdentifierTable* createIdentifierTable() { @@ -77,43 +67,32 @@ void deleteIdentifierTable(IdentifierTable* table) delete table; } -bool Identifier::equal(const UString::Rep* r, const char* s) +bool Identifier::equal(const StringImpl* r, const char* s) { - int length = r->size(); - const UChar* d = r->data(); + int length = r->length(); + const UChar* d = r->characters(); for (int i = 0; i != length; ++i) if (d[i] != (unsigned char)s[i]) return false; return s[length] == 0; } -bool Identifier::equal(const UString::Rep* r, const UChar* s, int length) -{ - if (r->size() != length) - return false; - const UChar* d = r->data(); - for (int i = 0; i != length; ++i) - if (d[i] != s[i]) - return false; - return true; -} - -struct CStringTranslator { +struct IdentifierCStringTranslator { static unsigned hash(const char* c) { - return UString::Rep::computeHash(c); + return StringHasher::computeHash(c); } - static bool equal(UString::Rep* r, const char* s) + static bool equal(StringImpl* r, const char* s) { return Identifier::equal(r, s); } - static void translate(UString::Rep*& location, const char* c, unsigned hash) + static void translate(StringImpl*& location, const char* c, unsigned hash) { size_t length = strlen(c); UChar* d; - UString::Rep* r = UString::Rep::createUninitialized(length, d).releaseRef(); + StringImpl* r = StringImpl::createUninitialized(length, d).leakRef(); for (size_t i = 0; i != length; i++) d[i] = static_cast(c[i]); // use unsigned char to zero-extend instead of sign-extend r->setHash(hash); @@ -121,16 +100,12 @@ struct CStringTranslator { } }; -PassRefPtr Identifier::add(JSGlobalData* globalData, const char* c) +PassRefPtr Identifier::add(JSGlobalData* globalData, const char* c) { - if (!c) { - UString::Rep::null().hash(); - return &UString::Rep::null(); - } - if (!c[0]) { - UString::Rep::empty().hash(); - return &UString::Rep::empty(); - } + if (!c) + return 0; + if (!c[0]) + return StringImpl::empty(); if (!c[1]) return add(globalData, globalData->smallStrings.singleCharacterStringRep(static_cast(c[0]))); @@ -141,18 +116,18 @@ PassRefPtr Identifier::add(JSGlobalData* globalData, const char* c if (iter != literalIdentifierTable.end()) return iter->second; - pair::iterator, bool> addResult = identifierTable.add(c); + pair::iterator, bool> addResult = identifierTable.add(c); // If the string is newly-translated, then we need to adopt it. // The boolean in the pair tells us if that is so. - RefPtr addedString = addResult.second ? adoptRef(*addResult.first) : *addResult.first; + RefPtr addedString = addResult.second ? adoptRef(*addResult.first) : *addResult.first; literalIdentifierTable.add(c, addedString.get()); return addedString.release(); } -PassRefPtr Identifier::add(ExecState* exec, const char* c) +PassRefPtr Identifier::add(ExecState* exec, const char* c) { return add(&exec->globalData(), c); } @@ -162,21 +137,21 @@ struct UCharBuffer { unsigned int length; }; -struct UCharBufferTranslator { +struct IdentifierUCharBufferTranslator { static unsigned hash(const UCharBuffer& buf) { - return UString::Rep::computeHash(buf.s, buf.length); + return StringHasher::computeHash(buf.s, buf.length); } - static bool equal(UString::Rep* str, const UCharBuffer& buf) + static bool equal(StringImpl* str, const UCharBuffer& buf) { return Identifier::equal(str, buf.s, buf.length); } - static void translate(UString::Rep*& location, const UCharBuffer& buf, unsigned hash) + static void translate(StringImpl*& location, const UCharBuffer& buf, unsigned hash) { UChar* d; - UString::Rep* r = UString::Rep::createUninitialized(buf.length, d).releaseRef(); + StringImpl* r = StringImpl::createUninitialized(buf.length, d).leakRef(); for (unsigned i = 0; i != buf.length; i++) d[i] = buf.s[i]; r->setHash(hash); @@ -184,114 +159,144 @@ struct UCharBufferTranslator { } }; -PassRefPtr Identifier::add(JSGlobalData* globalData, const UChar* s, int length) +uint32_t Identifier::toUInt32(const UString& string, bool& ok) +{ + ok = false; + + unsigned length = string.length(); + const UChar* characters = string.characters(); + + // An empty string is not a number. + if (!length) + return 0; + + // Get the first character, turning it into a digit. + uint32_t value = characters[0] - '0'; + if (value > 9) + return 0; + + // Check for leading zeros. If the first characher is 0, then the + // length of the string must be one - e.g. "042" is not equal to "42". + if (!value && length > 1) + return 0; + + while (--length) { + // Multiply value by 10, checking for overflow out of 32 bits. + if (value > 0xFFFFFFFFU / 10) + return 0; + value *= 10; + + // Get the next character, turning it into a digit. + uint32_t newValue = *(++characters) - '0'; + if (newValue > 9) + return 0; + + // Add in the old value, checking for overflow out of 32 bits. + newValue += value; + if (newValue < value) + return 0; + value = newValue; + } + + ok = true; + return value; +} + +PassRefPtr Identifier::add(JSGlobalData* globalData, const UChar* s, int length) { if (length == 1) { UChar c = s[0]; - if (c <= 0xFF) + if (c <= maxSingleCharacterString) return add(globalData, globalData->smallStrings.singleCharacterStringRep(c)); } - if (!length) { - UString::Rep::empty().hash(); - return &UString::Rep::empty(); - } + if (!length) + return StringImpl::empty(); UCharBuffer buf = {s, length}; - pair::iterator, bool> addResult = globalData->identifierTable->add(buf); + pair::iterator, bool> addResult = globalData->identifierTable->add(buf); // If the string is newly-translated, then we need to adopt it. // The boolean in the pair tells us if that is so. return addResult.second ? adoptRef(*addResult.first) : *addResult.first; } -PassRefPtr Identifier::add(ExecState* exec, const UChar* s, int length) +PassRefPtr Identifier::add(ExecState* exec, const UChar* s, int length) { return add(&exec->globalData(), s, length); } -PassRefPtr Identifier::addSlowCase(JSGlobalData* globalData, UString::Rep* r) +PassRefPtr Identifier::addSlowCase(JSGlobalData* globalData, StringImpl* r) { ASSERT(!r->isIdentifier()); - if (r->size() == 1) { - UChar c = r->data()[0]; - if (c <= 0xFF) + // The empty & null strings are static singletons, and static strings are handled + // in ::add() in the header, so we should never get here with a zero length string. + ASSERT(r->length()); + + if (r->length() == 1) { + UChar c = r->characters()[0]; + if (c <= maxSingleCharacterString) r = globalData->smallStrings.singleCharacterStringRep(c); - if (r->isIdentifier()) { -#ifndef NDEBUG - checkSameIdentifierTable(globalData, r); -#endif + if (r->isIdentifier()) return r; - } - } - if (!r->size()) { - UString::Rep::empty().hash(); - return &UString::Rep::empty(); } + return *globalData->identifierTable->add(r).first; } -PassRefPtr Identifier::addSlowCase(ExecState* exec, UString::Rep* r) +PassRefPtr Identifier::addSlowCase(ExecState* exec, StringImpl* r) { return addSlowCase(&exec->globalData(), r); } -void Identifier::remove(UString::Rep* r) +Identifier Identifier::from(ExecState* exec, unsigned value) { - currentIdentifierTable()->remove(r); + return Identifier(exec, exec->globalData().numericStrings.add(value)); } -#ifndef NDEBUG - -void Identifier::checkSameIdentifierTable(ExecState* exec, UString::Rep*) +Identifier Identifier::from(ExecState* exec, int value) { - ASSERT_UNUSED(exec, exec->globalData().identifierTable == currentIdentifierTable()); + return Identifier(exec, exec->globalData().numericStrings.add(value)); } -void Identifier::checkSameIdentifierTable(JSGlobalData* globalData, UString::Rep*) +Identifier Identifier::from(ExecState* exec, double value) { - ASSERT_UNUSED(globalData, globalData->identifierTable == currentIdentifierTable()); + return Identifier(exec, exec->globalData().numericStrings.add(value)); } -#else - -void Identifier::checkSameIdentifierTable(ExecState*, UString::Rep*) +Identifier Identifier::from(JSGlobalData* globalData, unsigned value) { + return Identifier(globalData, globalData->numericStrings.add(value)); } -void Identifier::checkSameIdentifierTable(JSGlobalData*, UString::Rep*) +Identifier Identifier::from(JSGlobalData* globalData, int value) { + return Identifier(globalData, globalData->numericStrings.add(value)); } -#endif - -ThreadSpecific* g_identifierTableSpecific = 0; -ThreadIdentifierTableData* g_identifierTableMain = 0; +Identifier Identifier::from(JSGlobalData* globalData, double value) +{ + return Identifier(globalData, globalData->numericStrings.add(value)); +} -#if ENABLE(JSC_MULTIPLE_THREADS) +#ifndef NDEBUG -pthread_once_t createIdentifierTableSpecificOnce = PTHREAD_ONCE_INIT; -static void createIdentifierTableSpecificCallback() +void Identifier::checkCurrentIdentifierTable(JSGlobalData* globalData) { - ASSERT(!g_identifierTableSpecific); - g_identifierTableSpecific = new ThreadSpecific(); - ASSERT(!g_identifierTableMain); - g_identifierTableMain = new ThreadIdentifierTableData(); + // Check the identifier table accessible through the threadspecific matches the + // globalData's identifier table. + ASSERT_UNUSED(globalData, globalData->identifierTable == wtfThreadData().currentIdentifierTable()); } -void createIdentifierTableSpecific() + +void Identifier::checkCurrentIdentifierTable(ExecState* exec) { - pthread_once(&createIdentifierTableSpecificOnce, createIdentifierTableSpecificCallback); - ASSERT(g_identifierTableSpecific); - ASSERT(g_identifierTableMain); + checkCurrentIdentifierTable(&exec->globalData()); } -#else +#else -void createIdentifierTableSpecific() -{ - ASSERT(!g_identifierTableSpecific); - g_identifierTableSpecific = new ThreadSpecific(); - ASSERT(!g_identifierTableMain); - g_identifierTableMain = new ThreadIdentifierTableData(); -} +// These only exists so that our exports are the same for debug and release builds. +// This would be an ASSERT_NOT_REACHED(), but we're in NDEBUG only code here! +void Identifier::checkCurrentIdentifierTable(JSGlobalData*) { CRASH(); } +void Identifier::checkCurrentIdentifierTable(ExecState*) { CRASH(); } #endif