JavaScriptCore-7600.1.4.17.5.tar.gz

[apple/javascriptcore.git] / parser / ParserArena.h

diff --git a/parser/ParserArena.h b/parser/ParserArena.h
index e806d45e162d2a6f56011daa8c836b2d80616156..d8bc2cffa427314564fd1b0415c82475ce52b235 100644 (file)
--- a/parser/ParserArena.h
+++ b/parser/ParserArena.h
@@ -26,6 +26,7 @@
 #ifndef ParserArena_h
 #define ParserArena_h
 
 #ifndef ParserArena_h
 #define ParserArena_h
 

+#include "CommonIdentifiers.h"

 #include "Identifier.h"
 #include <array>
 #include <wtf/SegmentedVector.h>
 #include "Identifier.h"
 #include <array>
 #include <wtf/SegmentedVector.h>


@@ -72,6 +73,8 @@ namespace JSC {
     template <typename T>
     ALWAYS_INLINE const Identifier& IdentifierArena::makeIdentifier(VM* vm, const T* characters, size_t length)
     {
     template <typename T>
     ALWAYS_INLINE const Identifier& IdentifierArena::makeIdentifier(VM* vm, const T* characters, size_t length)
     {

+        if (!length)
+            return vm->propertyNames->emptyIdentifier;

         if (characters[0] >= MaximumCachableCharacter) {
             m_identifiers.append(Identifier(vm, characters, length));
             return m_identifiers.last();
         if (characters[0] >= MaximumCachableCharacter) {
             m_identifiers.append(Identifier(vm, characters, length));
             return m_identifiers.last();


@@ -93,6 +96,8 @@ namespace JSC {
 
     ALWAYS_INLINE const Identifier& IdentifierArena::makeIdentifierLCharFromUChar(VM* vm, const UChar* characters, size_t length)
     {
 
     ALWAYS_INLINE const Identifier& IdentifierArena::makeIdentifierLCharFromUChar(VM* vm, const UChar* characters, size_t length)
     {

+        if (!length)
+            return vm->propertyNames->emptyIdentifier;

         if (characters[0] >= MaximumCachableCharacter) {
             m_identifiers.append(Identifier::createLCharFromUChar(vm, characters, length));
             return m_identifiers.last();
         if (characters[0] >= MaximumCachableCharacter) {
             m_identifiers.append(Identifier::createLCharFromUChar(vm, characters, length));
             return m_identifiers.last();