Changeset 20310 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Mar 18, 2007, 10:43:47 PM (18 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Mark.

• avoid static construction (and global variable access) in a smarter, more portable way, to later enable MUTLI_THREAD mode to work on other platforms and compilers.

• kjs/CommonIdentifiers.cpp: Added. New class to hold all the shared identifiers. (KJS::CommonIdentifiers::CommonIdentifiers): (KJS::CommonIdentifiers::shared):
• kjs/CommonIdentifiers.h: Added.

• kjs/ExecState.h: (KJS::ExecState::propertyNames): Hand the CommonIdentifiers instance here for easy access. (KJS::ExecState::ExecState):

• API/JSObjectRef.cpp: (JSObjectMakeConstructor):
• CMakeLists.txt:
• JavaScriptCore.exp:
• JavaScriptCore.pri:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• JavaScriptCoreSources.bkl:
• bindings/runtime_array.cpp: (RuntimeArray::getOwnPropertySlot): (RuntimeArray::put):
• bindings/runtime_method.cpp: (RuntimeMethod::getOwnPropertySlot):
• kjs/array_object.cpp: (ArrayInstance::getOwnPropertySlot): (ArrayInstance::put): (ArrayInstance::deleteProperty): (ArrayProtoFunc::ArrayProtoFunc): (ArrayProtoFunc::callAsFunction): (ArrayObjectImp::ArrayObjectImp):
• kjs/bool_object.cpp: (BooleanPrototype::BooleanPrototype): (BooleanProtoFunc::BooleanProtoFunc): (BooleanProtoFunc::callAsFunction): (BooleanObjectImp::BooleanObjectImp):
• kjs/completion.h: (KJS::Completion::Completion):
• kjs/date_object.cpp: (KJS::DateProtoFunc::DateProtoFunc): (KJS::DateObjectImp::DateObjectImp): (KJS::DateObjectFuncImp::DateObjectFuncImp):
• kjs/error_object.cpp: (ErrorPrototype::ErrorPrototype): (ErrorProtoFunc::ErrorProtoFunc): (ErrorProtoFunc::callAsFunction): (ErrorObjectImp::ErrorObjectImp): (ErrorObjectImp::construct): (NativeErrorPrototype::NativeErrorPrototype): (NativeErrorImp::NativeErrorImp): (NativeErrorImp::construct): (NativeErrorImp::callAsFunction):
• kjs/function.cpp: (KJS::FunctionImp::getOwnPropertySlot): (KJS::FunctionImp::put): (KJS::FunctionImp::deleteProperty): (KJS::FunctionImp::getParameterName): (KJS::DeclaredFunctionImp::construct): (KJS::IndexToNameMap::unMap): (KJS::Arguments::Arguments): (KJS::ActivationImp::getOwnPropertySlot): (KJS::ActivationImp::deleteProperty): (KJS::GlobalFuncImp::GlobalFuncImp):
• kjs/function_object.cpp: (FunctionPrototype::FunctionPrototype): (FunctionProtoFunc::FunctionProtoFunc): (FunctionProtoFunc::callAsFunction): (FunctionObjectImp::FunctionObjectImp): (FunctionObjectImp::construct):
• kjs/grammar.y:
• kjs/identifier.cpp:
• kjs/identifier.h:
• kjs/interpreter.cpp: (KJS::Interpreter::init): (KJS::Interpreter::initGlobalObject):
• kjs/interpreter.h:
• kjs/lookup.h:
• kjs/math_object.cpp: (MathFuncImp::MathFuncImp):
• kjs/nodes.cpp: (ArrayNode::evaluate): (FuncDeclNode::processFuncDecl): (FuncExprNode::evaluate):
• kjs/number_object.cpp: (NumberPrototype::NumberPrototype): (NumberProtoFunc::NumberProtoFunc): (NumberObjectImp::NumberObjectImp):
• kjs/object.cpp: (KJS::JSObject::put): (KJS::JSObject::defaultValue): (KJS::JSObject::hasInstance):
• kjs/object.h: (KJS::JSObject::getOwnPropertySlot):
• kjs/object_object.cpp: (ObjectPrototype::ObjectPrototype): (ObjectProtoFunc::ObjectProtoFunc): (ObjectObjectImp::ObjectObjectImp):
• kjs/regexp_object.cpp: (RegExpPrototype::RegExpPrototype): (RegExpProtoFunc::RegExpProtoFunc): (RegExpObjectImp::RegExpObjectImp):
• kjs/string_object.cpp: (KJS::StringInstance::getOwnPropertySlot): (KJS::StringInstance::put): (KJS::StringInstance::deleteProperty): (KJS::StringPrototype::StringPrototype): (KJS::StringProtoFunc::StringProtoFunc): (KJS::StringProtoFunc::callAsFunction): (KJS::StringObjectImp::StringObjectImp): (KJS::StringObjectFuncImp::StringObjectFuncImp):
• kjs/testkjs.cpp: (TestFunctionImp::TestFunctionImp):

WebCore:

Reviewed by Mark.

• avoid static construction (and global variable access) in a smarter, more portable way, to later enable MUTLI_THREAD mode to work on other platforms and compilers.

• bindings/js/JSCustomXPathNSResolver.cpp: (WebCore::JSCustomXPathNSResolver::lookupNamespaceURI):
• bindings/js/JSHTMLInputElementBase.cpp: (WebCore::JSHTMLInputElementBaseFunction::JSHTMLInputElementBaseFunction):
• bindings/js/JSHTMLOptionElementConstructor.cpp: (WebCore::JSHTMLOptionElementConstructor::JSHTMLOptionElementConstructor):
• bindings/js/JSXMLHttpRequest.cpp: (KJS::JSXMLHttpRequestConstructorImp::JSXMLHttpRequestConstructorImp):
• bindings/js/JSXSLTProcessor.cpp: (KJS::XSLTProcessorConstructorImp::XSLTProcessorConstructorImp):
• bindings/js/kjs_dom.cpp: (KJS::DOMNamedNodeMap::getOwnPropertySlot): (KJS::DOMNamedNodesCollection::getOwnPropertySlot):
• bindings/js/kjs_events.cpp: (KJS::JSAbstractEventListener::handleEvent):
• bindings/js/kjs_html.cpp: (KJS::HTMLElementFunction::HTMLElementFunction): (KJS::JSHTMLCollection::getOwnPropertySlot):
• bindings/js/kjs_window.cpp: (KJS::ScheduledAction::execute):
• bindings/objc/WebScriptObject.mm:
• bindings/scripts/CodeGeneratorJS.pm:

Location:

trunk/JavaScriptCore/kjs

Files:

• CommonIdentifiers.cpp (added)
• CommonIdentifiers.h (added)
• ExecState.h (modified) (4 diffs)
• array_object.cpp (modified) (18 diffs)
• bool_object.cpp (modified) (3 diffs)
• completion.h (modified) (2 diffs)
• date_object.cpp (modified) (4 diffs)
• error_object.cpp (modified) (6 diffs)
• function.cpp (modified) (12 diffs)
• function_object.cpp (modified) (5 diffs)
• grammar.y (modified) (4 diffs)
• identifier.cpp (modified) (2 diffs)
• identifier.h (modified) (4 diffs)
• interpreter.cpp (modified) (3 diffs)
• interpreter.h (modified) (2 diffs)
• lookup.h (modified) (1 diff)
• math_object.cpp (modified) (1 diff)
• nodes.cpp (modified) (5 diffs)
• number_object.cpp (modified) (3 diffs)
• object.cpp (modified) (4 diffs)
• object.h (modified) (4 diffs)
• object_object.cpp (modified) (3 diffs)
• regexp_object.cpp (modified) (2 diffs)
• string_object.cpp (modified) (11 diffs)
• testkjs.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/ExecState.h

@@ -27 +27 @@
 #include "value.h"
 #include "types.h"
+#include "CommonIdentifiers.h"
 
 namespace KJS {
@@ -76 +77 @@
     bool hadException() const { return !!m_exception; }
 
+    // This is a workaround to avoid accessing the global variables for these identifiers in
+    // important property lookup functions, to avoid taking PIC branches in Mach-O binaries
+    const CommonIdentifiers& propertyNames() const { return *m_propertyNames; }
+
   private:
     ExecState(Interpreter* interp, Context* con)
@@ -81 +86 @@
         , m_context(con)
         , m_exception(0)
+        , m_propertyNames(CommonIdentifiers::shared())
     { 
     }
@@ -86 +92 @@
     Context* m_context;
     JSValue* m_exception;
+    CommonIdentifiers* m_propertyNames;
   };
 

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -90 +90 @@
 bool ArrayInstance::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
 {
-  if (propertyName == lengthPropertyName) {
+  if (propertyName == exec->propertyNames().length) {
     slot.setCustom(this, lengthGetter);
     return true;
@@ -131 +131 @@
 
 // Special implementation of [[Put]] - see ECMA 15.4.5.1
-void ArrayInstance::put(ExecState *exec, const Identifier &propertyName, JSValue *value, int attr)
-{
-  if (propertyName == lengthPropertyName) {
+void ArrayInstance::put(ExecState* exec, const Identifier& propertyName, JSValue* value, int attr)
+{
+  if (propertyName == exec->propertyNames().length) {
     unsigned int newLen = value->toUInt32(exec);
     if (value->toNumber(exec) != double(newLen)) {
@@ -179 +179 @@
 }
 
-bool ArrayInstance::deleteProperty(ExecState *exec, const Identifier &propertyName)
-{
-  if (propertyName == lengthPropertyName)
+bool ArrayInstance::deleteProperty(ExecState* exec, const Identifier &propertyName)
+{
+  if (propertyName == exec->propertyNames().length)
     return false;
   
@@ -436 +436 @@
 // ------------------------------ ArrayProtoFunc ----------------------------
 
-ArrayProtoFunc::ArrayProtoFunc(ExecState *exec, int i, int len, const Identifier& name)
+ArrayProtoFunc::ArrayProtoFunc(ExecState* exec, int i, int len, const Identifier& name)
   : InternalFunctionImp(static_cast<FunctionPrototype*>
                         (exec->lexicalInterpreter()->builtinFunctionPrototype()), name)
   , id(i)
 {
-  put(exec,lengthPropertyName,jsNumber(len),DontDelete|ReadOnly|DontEnum);
+  put(exec, exec->propertyNames().length, jsNumber(len), DontDelete | ReadOnly | DontEnum);
 }
 
@@ -453 +453 @@
 
 // ECMA 15.4.4
-JSValue *ArrayProtoFunc::callAsFunction(ExecState *exec, JSObject *thisObj, const List &args)
-{
-  unsigned length = thisObj->get(exec,lengthPropertyName)->toUInt32(exec);
+JSValue* ArrayProtoFunc::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+{
+  unsigned length = thisObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
 
   JSValue *result = 0; // work around gcc 4.0 bug in uninitialized variable warning
@@ -488 +488 @@
         if (id == ToLocaleString) {
             JSObject* o = element->toObject(exec);
-            JSValue* conversionFunction = o->get(exec, toLocaleStringPropertyName);
+            JSValue* conversionFunction = o->get(exec, exec->propertyNames().toLocaleString);
             if (conversionFunction->isObject() && static_cast<JSObject*>(conversionFunction)->implementsCall())
                 str += static_cast<JSObject*>(conversionFunction)->call(exec, o, List())->toString(exec);
@@ -518 +518 @@
         // Older versions tried to optimize out getting the length of thisObj
         // by checking for n != 0, but that doesn't work if thisObj is an empty array.
-        length = curObj->get(exec,lengthPropertyName)->toUInt32(exec);
+        length = curObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
         while (k < length) {
           if (JSValue *v = getProperty(exec, curObj, k))
@@ -534 +534 @@
       curObj = static_cast<JSObject *>(it++); // may be 0
     }
-    arr->put(exec,lengthPropertyName, jsNumber(n), DontEnum | DontDelete);
+    arr->put(exec, exec->propertyNames().length, jsNumber(n), DontEnum | DontDelete);
 
     result = arr;
@@ -541 +541 @@
   case Pop:{
     if (length == 0) {
-      thisObj->put(exec, lengthPropertyName, jsNumber(length), DontEnum | DontDelete);
+      thisObj->put(exec, exec->propertyNames().length, jsNumber(length), DontEnum | DontDelete);
       result = jsUndefined();
     } else {
       result = thisObj->get(exec, length - 1);
-      thisObj->put(exec, lengthPropertyName, jsNumber(length - 1), DontEnum | DontDelete);
+      thisObj->put(exec, exec->propertyNames().length, jsNumber(length - 1), DontEnum | DontDelete);
     }
     break;
@@ -553 +553 @@
       thisObj->put(exec, length + n, args[n]);
     length += args.size();
-    thisObj->put(exec,lengthPropertyName, jsNumber(length), DontEnum | DontDelete);
+    thisObj->put(exec, exec->propertyNames().length, jsNumber(length), DontEnum | DontDelete);
     result = jsNumber(length);
     break;
@@ -581 +581 @@
   case Shift: {
     if (length == 0) {
-      thisObj->put(exec, lengthPropertyName, jsNumber(length), DontEnum | DontDelete);
+      thisObj->put(exec, exec->propertyNames().length, jsNumber(length), DontEnum | DontDelete);
       result = jsUndefined();
     } else {
@@ -592 +592 @@
       }
       thisObj->deleteProperty(exec, length - 1);
-      thisObj->put(exec, lengthPropertyName, jsNumber(length - 1), DontEnum | DontDelete);
+      thisObj->put(exec, exec->propertyNames().length, jsNumber(length - 1), DontEnum | DontDelete);
     }
     break;
@@ -635 +635 @@
         resObj->put(exec, n, v);
     }
-    resObj->put(exec, lengthPropertyName, jsNumber(n), DontEnum | DontDelete);
+    resObj->put(exec, exec->propertyNames().length, jsNumber(n), DontEnum | DontDelete);
     break;
   }
@@ -662 +662 @@
 
     if (length == 0) {
-      thisObj->put(exec, lengthPropertyName, jsNumber(0), DontEnum | DontDelete);
+      thisObj->put(exec, exec->propertyNames().length, jsNumber(0), DontEnum | DontDelete);
       result = thisObj;
       break;
@@ -728 +728 @@
         resObj->put(exec, k, v);
     }
-    resObj->put(exec, lengthPropertyName, jsNumber(deleteCount), DontEnum | DontDelete);
+    resObj->put(exec, exec->propertyNames().length, jsNumber(deleteCount), DontEnum | DontDelete);
 
     unsigned int additionalArgs = maxInt( args.size() - 2, 0 );
@@ -760 +760 @@
       thisObj->put(exec, k+begin, args[k+2]);
     }
-    thisObj->put(exec, lengthPropertyName, jsNumber(length - deleteCount + additionalArgs), DontEnum | DontDelete);
+    thisObj->put(exec, exec->propertyNames().length, jsNumber(length - deleteCount + additionalArgs), DontEnum | DontDelete);
     break;
   }
@@ -775 +775 @@
       thisObj->put(exec, k, args[k]);
     result = jsNumber(length + nrArgs);
-    thisObj->put(exec, lengthPropertyName, result, DontEnum | DontDelete);
+    thisObj->put(exec, exec->propertyNames().length, result, DontEnum | DontDelete);
     break;
   }
@@ -936 +936 @@
 {
   // ECMA 15.4.3.1 Array.prototype
-  put(exec, prototypePropertyName, arrayProto, DontEnum|DontDelete|ReadOnly);
+  put(exec, exec->propertyNames().prototype, arrayProto, DontEnum|DontDelete|ReadOnly);
 
   // no. of arguments for constructor
-  put(exec, lengthPropertyName, jsNumber(1), ReadOnly|DontDelete|DontEnum);
+  put(exec, exec->propertyNames().length, jsNumber(1), ReadOnly|DontDelete|DontEnum);
 }
 

trunk/JavaScriptCore/kjs/bool_object.cpp

@@ -47 +47 @@
   // The constructor will be added later by Interpreter::Interpreter()
 
-  putDirectFunction(new BooleanProtoFunc(exec, funcProto, BooleanProtoFunc::ToString, 0, toStringPropertyName), DontEnum);
-  putDirectFunction(new BooleanProtoFunc(exec, funcProto, BooleanProtoFunc::ValueOf, 0, valueOfPropertyName),  DontEnum);
+  putDirectFunction(new BooleanProtoFunc(exec, funcProto, BooleanProtoFunc::ToString, 0, exec->propertyNames().toString), DontEnum);
+  putDirectFunction(new BooleanProtoFunc(exec, funcProto, BooleanProtoFunc::ValueOf, 0, exec->propertyNames().valueOf),  DontEnum);
   setInternalValue(jsBoolean(false));
 }
@@ -55 +55 @@
 // ------------------------------ BooleanProtoFunc --------------------------
 
-BooleanProtoFunc::BooleanProtoFunc(ExecState*, FunctionPrototype* funcProto, int i, int len, const Identifier& name)
+BooleanProtoFunc::BooleanProtoFunc(ExecState* exec, FunctionPrototype* funcProto, int i, int len, const Identifier& name)
   : InternalFunctionImp(funcProto, name)
   , id(i)
 {
-  putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
+  putDirect(exec->propertyNames().length, len, DontDelete|ReadOnly|DontEnum);
 }
 
 
 // ECMA 15.6.4.2 + 15.6.4.3
-JSValue *BooleanProtoFunc::callAsFunction(ExecState *exec, JSObject *thisObj, const List &/*args*/)
+JSValue *BooleanProtoFunc::callAsFunction(ExecState* exec, JSObject *thisObj, const List &/*args*/)
 {
   // no generic function. "this" has to be a Boolean object
@@ -83 +83 @@
 
 
-BooleanObjectImp::BooleanObjectImp(ExecState*, FunctionPrototype* funcProto, BooleanPrototype* booleanProto)
+BooleanObjectImp::BooleanObjectImp(ExecState* exec, FunctionPrototype* funcProto, BooleanPrototype* booleanProto)
   : InternalFunctionImp(funcProto)
 {
-  putDirect(prototypePropertyName, booleanProto, DontEnum|DontDelete|ReadOnly);
+  putDirect(exec->propertyNames().prototype, booleanProto, DontEnum|DontDelete|ReadOnly);
 
   // no. of arguments for constructor
-  putDirect(lengthPropertyName, jsNumber(1), ReadOnly|DontDelete|DontEnum);
+  putDirect(exec->propertyNames().length, jsNumber(1), ReadOnly|DontDelete|DontEnum);
 }
 

trunk/JavaScriptCore/kjs/completion.h

@@ -26 +26 @@
 #define _KJS_COMPLETION_H_
 
-#include "identifier.h"
+#include "CommonIdentifiers.h"
 #include "value.h"
 
@@ -48 +48 @@
   class Completion {
   public:
-    Completion(ComplType c = Normal, JSValue *v = NULL, const Identifier &t = Identifier::null())
+    Completion(ComplType c = Normal, JSValue *v = NULL, const Identifier &t = CommonIdentifiers::shared()->nullIdentifier)
         : comp(c), val(v), tar(t) { }
 

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -434 +434 @@
 // ------------------------------ DateProtoFunc -----------------------------
 
-DateProtoFunc::DateProtoFunc(ExecState *exec, int i, int len, const Identifier& name)
+DateProtoFunc::DateProtoFunc(ExecState* exec, int i, int len, const Identifier& name)
   : InternalFunctionImp(static_cast<FunctionPrototype*>(exec->lexicalInterpreter()->builtinFunctionPrototype()), name)
   , id(abs(i))
@@ -440 +440 @@
   // We use a negative ID to denote the "UTC" variant.
 {
-    putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
+    putDirect(exec->propertyNames().length, len, DontDelete|ReadOnly|DontEnum);
 }
 
@@ -600 +600 @@
   static const Identifier* UTCPropertyName = new Identifier("UTC");
 
-  putDirect(prototypePropertyName, dateProto, DontEnum|DontDelete|ReadOnly);
+  putDirect(exec->propertyNames().prototype, dateProto, DontEnum|DontDelete|ReadOnly);
   putDirectFunction(new DateObjectFuncImp(exec, funcProto, DateObjectFuncImp::Parse, 1, *parsePropertyName), DontEnum);
   putDirectFunction(new DateObjectFuncImp(exec, funcProto, DateObjectFuncImp::UTC, 7, *UTCPropertyName), DontEnum);
-  putDirect(lengthPropertyName, 7, ReadOnly|DontDelete|DontEnum);
+  putDirect(exec->propertyNames().length, 7, ReadOnly|DontDelete|DontEnum);
 }
 
@@ -669 +669 @@
 // ------------------------------ DateObjectFuncImp ----------------------------
 
-DateObjectFuncImp::DateObjectFuncImp(ExecState*, FunctionPrototype* funcProto, int i, int len, const Identifier& name)
+DateObjectFuncImp::DateObjectFuncImp(ExecState* exec, FunctionPrototype* funcProto, int i, int len, const Identifier& name)
     : InternalFunctionImp(funcProto, name), id(i)
 {
-    putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
+    putDirect(exec->propertyNames().length, len, DontDelete|ReadOnly|DontEnum);
 }
 

trunk/JavaScriptCore/kjs/error_object.cpp

@@ -44 +44 @@
 
 // ECMA 15.9.4
-ErrorPrototype::ErrorPrototype(ExecState *exec,
-                                     ObjectPrototype *objectProto,
-                                     FunctionPrototype *funcProto)
+ErrorPrototype::ErrorPrototype(ExecState* exec, ObjectPrototype* objectProto, FunctionPrototype* funcProto)
   : JSObject(objectProto)
 {
   // The constructor will be added later in ErrorObjectImp's constructor
 
-  put(exec, namePropertyName,     jsString("Error"), DontEnum);
-  put(exec, messagePropertyName,  jsString("Unknown error"), DontEnum);
-  putDirectFunction(new ErrorProtoFunc(exec, funcProto, toStringPropertyName), DontEnum);
+  put(exec, exec->propertyNames().name,     jsString("Error"), DontEnum);
+  put(exec, exec->propertyNames().message,  jsString("Unknown error"), DontEnum);
+  putDirectFunction(new ErrorProtoFunc(exec, funcProto, exec->propertyNames().toString), DontEnum);
 }
 
 // ------------------------------ ErrorProtoFunc ----------------------------
 
-ErrorProtoFunc::ErrorProtoFunc(ExecState*, FunctionPrototype* funcProto, const Identifier& name)
+ErrorProtoFunc::ErrorProtoFunc(ExecState* exec, FunctionPrototype* funcProto, const Identifier& name)
   : InternalFunctionImp(funcProto, name)
 {
-  putDirect(lengthPropertyName, jsNumber(0), DontDelete|ReadOnly|DontEnum);
+  putDirect(exec->propertyNames().length, jsNumber(0), DontDelete|ReadOnly|DontEnum);
 }
 
-JSValue *ErrorProtoFunc::callAsFunction(ExecState *exec, JSObject *thisObj, const List &/*args*/)
+JSValue* ErrorProtoFunc::callAsFunction(ExecState* exec, JSObject* thisObj, const List &/*args*/)
 {
   // toString()
   UString s = "Error";
 
-  JSValue *v = thisObj->get(exec, namePropertyName);
+  JSValue* v = thisObj->get(exec, exec->propertyNames().name);
   if (!v->isUndefined()) {
     s = v->toString(exec);
   }
 
-  v = thisObj->get(exec, messagePropertyName);
+  v = thisObj->get(exec, exec->propertyNames().message);
   if (!v->isUndefined()) {
     s += ": " + v->toString(exec); // Mozilla compatible format
@@ -84 +82 @@
 // ------------------------------ ErrorObjectImp -------------------------------
 
-ErrorObjectImp::ErrorObjectImp(ExecState*, FunctionPrototype* funcProto, ErrorPrototype* errorProto)
+ErrorObjectImp::ErrorObjectImp(ExecState* exec, FunctionPrototype* funcProto, ErrorPrototype* errorProto)
   : InternalFunctionImp(funcProto)
 {
   // ECMA 15.11.3.1 Error.prototype
-  putDirect(prototypePropertyName, errorProto, DontEnum|DontDelete|ReadOnly);
-  putDirect(lengthPropertyName, jsNumber(1), DontDelete|ReadOnly|DontEnum);
+  putDirect(exec->propertyNames().prototype, errorProto, DontEnum|DontDelete|ReadOnly);
+  putDirect(exec->propertyNames().length, jsNumber(1), DontDelete|ReadOnly|DontEnum);
   //putDirect(namePropertyName, jsString(n));
 }
@@ -99 +97 @@
 
 // ECMA 15.9.3
-JSObject *ErrorObjectImp::construct(ExecState *exec, const List &args)
+JSObject* ErrorObjectImp::construct(ExecState* exec, const List &args)
 {
-  JSObject *proto = static_cast<JSObject *>(exec->lexicalInterpreter()->builtinErrorPrototype());
-  JSObject *imp = new ErrorInstance(proto);
-  JSObject *obj(imp);
+  JSObject* proto = static_cast<JSObject*>(exec->lexicalInterpreter()->builtinErrorPrototype());
+  JSObject* imp = new ErrorInstance(proto);
+  JSObject* obj(imp);
 
   if (!args[0]->isUndefined())
-    imp->putDirect(messagePropertyName, jsString(args[0]->toString(exec)));
+    imp->putDirect(exec->propertyNames().message, jsString(args[0]->toString(exec)));
 
   return obj;
@@ -120 +118 @@
 // ------------------------------ NativeErrorPrototype ----------------------
 
-NativeErrorPrototype::NativeErrorPrototype(ExecState*, ErrorPrototype* errorProto, ErrorType et, UString name, UString message)
+NativeErrorPrototype::NativeErrorPrototype(ExecState* exec, ErrorPrototype* errorProto, ErrorType et, UString name, UString message)
   : JSObject(errorProto)
 {
   errType = et;
-  putDirect(namePropertyName, jsString(name), 0);
-  putDirect(messagePropertyName, jsString(message), 0);
+  putDirect(exec->propertyNames().name, jsString(name), 0);
+  putDirect(exec->propertyNames().message, jsString(message), 0);
 }
 
@@ -132 +130 @@
 const ClassInfo NativeErrorImp::info = {"Function", &InternalFunctionImp::info, 0, 0};
 
-NativeErrorImp::NativeErrorImp(ExecState*, FunctionPrototype* funcProto, JSObject* prot)
+NativeErrorImp::NativeErrorImp(ExecState* exec, FunctionPrototype* funcProto, JSObject* prot)
   : InternalFunctionImp(funcProto)
   , proto(prot)
 {
-  putDirect(lengthPropertyName, jsNumber(1), DontDelete|ReadOnly|DontEnum); // ECMA 15.11.7.5
-  putDirect(prototypePropertyName, proto, DontDelete|ReadOnly|DontEnum);
+  putDirect(exec->propertyNames().length, jsNumber(1), DontDelete|ReadOnly|DontEnum); // ECMA 15.11.7.5
+  putDirect(exec->propertyNames().prototype, proto, DontDelete|ReadOnly|DontEnum);
 }
 
@@ -145 +143 @@
 }
 
-JSObject *NativeErrorImp::construct(ExecState *exec, const List &args)
+JSObject* NativeErrorImp::construct(ExecState* exec, const List& args)
 {
-  JSObject *imp = new ErrorInstance(proto);
-  JSObject *obj(imp);
+  JSObject* imp = new ErrorInstance(proto);
+  JSObject* obj(imp);
   if (!args[0]->isUndefined())
-    imp->putDirect(messagePropertyName, jsString(args[0]->toString(exec)));
+    imp->putDirect(exec->propertyNames().message, jsString(args[0]->toString(exec)));
   return obj;
 }
 
-JSValue *NativeErrorImp::callAsFunction(ExecState *exec, JSObject* /*thisObj*/, const List &args)
+JSValue* NativeErrorImp::callAsFunction(ExecState* exec, JSObject*, const List& args)
 {
-  return construct(exec,args);
+  return construct(exec, args);
 }
 

trunk/JavaScriptCore/kjs/function.cpp

@@ -263 +263 @@
 {
     // Find the arguments from the closest context.
-    if (propertyName == exec->dynamicInterpreter()->argumentsIdentifier()) {
+    if (propertyName == exec->propertyNames().arguments) {
         slot.setCustom(this, argumentsGetter);
         return true;
@@ -269 +269 @@
 
     // Compute length of parameters.
-    if (propertyName == lengthPropertyName) {
+    if (propertyName == exec->propertyNames().length) {
         slot.setCustom(this, lengthGetter);
         return true;
     }
 
-    if (propertyName == callerPropertyName) {
+    if (propertyName == exec->propertyNames().caller) {
         slot.setCustom(this, callerGetter);
         return true;
@@ -284 +284 @@
 void FunctionImp::put(ExecState* exec, const Identifier& propertyName, JSValue* value, int attr)
 {
-    if (propertyName == exec->dynamicInterpreter()->argumentsIdentifier() || propertyName == lengthPropertyName)
+    if (propertyName == exec->propertyNames().arguments || propertyName == exec->propertyNames().length)
         return;
     InternalFunctionImp::put(exec, propertyName, value, attr);
@@ -291 +291 @@
 bool FunctionImp::deleteProperty(ExecState* exec, const Identifier& propertyName)
 {
-    if (propertyName == exec->dynamicInterpreter()->argumentsIdentifier() || propertyName == lengthPropertyName)
+    if (propertyName == exec->propertyNames().arguments || propertyName == exec->propertyNames().length)
         return false;
     return InternalFunctionImp::deleteProperty(exec, propertyName);
@@ -306 +306 @@
 {
     if (!parameters)
-        return Identifier::null();
+        return CommonIdentifiers::shared()->nullIdentifier;
 
     if (static_cast<size_t>(index) >= parameters->size())
-        return Identifier::null();
+        return CommonIdentifiers::shared()->nullIdentifier;
   
     Identifier name = parameters->at(index).name;
@@ -316 +316 @@
     for (size_t i = index + 1; i < parameters->size(); ++i)
         if (parameters->at(i).name == name)
-            return Identifier::null();
+            return CommonIdentifiers::shared()->nullIdentifier;
 
     return name;
@@ -342 +342 @@
 {
   JSObject* proto;
-  JSValue* p = get(exec,prototypePropertyName);
+  JSValue* p = get(exec, exec->propertyNames().prototype);
   if (p->isObject())
     proto = static_cast<JSObject*>(p);
@@ -422 +422 @@
   assert(indexIsNumber && indexAsNumber < size);
   
-  _map[indexAsNumber] = Identifier::null();
+  _map[indexAsNumber] = CommonIdentifiers::shared()->nullIdentifier;
 }
 
@@ -450 +450 @@
 indexToNameMap(func, args)
 {
-  putDirect(calleePropertyName, func, DontEnum);
-  putDirect(lengthPropertyName, args.size(), DontEnum);
+  putDirect(exec->propertyNames().callee, func, DontEnum);
+  putDirect(exec->propertyNames().length, args.size(), DontEnum);
   
   int i = 0;
@@ -543 +543 @@
     }
 
-    if (propertyName == exec->dynamicInterpreter()->argumentsIdentifier()) {
+    if (propertyName == exec->propertyNames().arguments) {
         slot.setCustom(this, getArgumentsGetter());
         return true;
@@ -553 +553 @@
 bool ActivationImp::deleteProperty(ExecState* exec, const Identifier& propertyName)
 {
-    if (propertyName == exec->dynamicInterpreter()->argumentsIdentifier())
+    if (propertyName == exec->propertyNames().arguments)
         return false;
     return JSObject::deleteProperty(exec, propertyName);
@@ -585 +585 @@
 
 
-GlobalFuncImp::GlobalFuncImp(ExecState*, FunctionPrototype* funcProto, int i, int len, const Identifier& name)
+GlobalFuncImp::GlobalFuncImp(ExecState* exec, FunctionPrototype* funcProto, int i, int len, const Identifier& name)
   : InternalFunctionImp(funcProto, name)
   , id(i)
 {
-  putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
+  putDirect(exec->propertyNames().length, len, DontDelete|ReadOnly|DontEnum);
 }
 

trunk/JavaScriptCore/kjs/function_object.cpp

@@ -44 +44 @@
   static const Identifier* callPropertyName = new Identifier("call");
 
-  putDirect(lengthPropertyName, jsNumber(0), DontDelete|ReadOnly|DontEnum);
-  putDirectFunction(new FunctionProtoFunc(exec, this, FunctionProtoFunc::ToString, 0, toStringPropertyName), DontEnum);
+  putDirect(exec->propertyNames().length, jsNumber(0), DontDelete | ReadOnly | DontEnum);
+  putDirectFunction(new FunctionProtoFunc(exec, this, FunctionProtoFunc::ToString, 0, exec->propertyNames().toString), DontEnum);
   putDirectFunction(new FunctionProtoFunc(exec, this, FunctionProtoFunc::Apply, 2, *applyPropertyName), DontEnum);
   putDirectFunction(new FunctionProtoFunc(exec, this, FunctionProtoFunc::Call, 1, *callPropertyName), DontEnum);
@@ -62 +62 @@
 // ------------------------------ FunctionProtoFunc -------------------------
 
-FunctionProtoFunc::FunctionProtoFunc(ExecState*, FunctionPrototype* funcProto, int i, int len, const Identifier& name)
+FunctionProtoFunc::FunctionProtoFunc(ExecState* exec, FunctionPrototype* funcProto, int i, int len, const Identifier& name)
   : InternalFunctionImp(funcProto, name)
   , id(i)
 {
-  putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
-}
-
-JSValue *FunctionProtoFunc::callAsFunction(ExecState *exec, JSObject *thisObj, const List &args)
-{
-  JSValue *result = NULL;
+  putDirect(exec->propertyNames().length, len, DontDelete | ReadOnly | DontEnum);
+}
+
+JSValue* FunctionProtoFunc::callAsFunction(ExecState* exec, JSObject* thisObj, const List &args)
+{
+  JSValue* result = NULL;
 
   switch (id) {
@@ -114 +114 @@
 
         JSObject *argArrayObj = static_cast<JSObject *>(argArray);
-        unsigned int length = argArrayObj->get(exec,lengthPropertyName)->toUInt32(exec);
+        unsigned int length = argArrayObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
         for (unsigned int i = 0; i < length; i++)
           applyArgs.append(argArrayObj->get(exec,i));
@@ -147 +147 @@
 // ------------------------------ FunctionObjectImp ----------------------------
 
-FunctionObjectImp::FunctionObjectImp(ExecState*, FunctionPrototype* funcProto)
+FunctionObjectImp::FunctionObjectImp(ExecState* exec, FunctionPrototype* funcProto)
   : InternalFunctionImp(funcProto)
 {
-  putDirect(prototypePropertyName, funcProto, DontEnum|DontDelete|ReadOnly);
+  putDirect(exec->propertyNames().prototype, funcProto, DontEnum|DontDelete|ReadOnly);
 
   // no. of arguments for constructor
-  putDirect(lengthPropertyName, jsNumber(1), ReadOnly|DontDelete|DontEnum);
+  putDirect(exec->propertyNames().length, jsNumber(1), ReadOnly|DontDelete|DontEnum);
 }
 
@@ -244 +244 @@
   List consArgs;
 
-  JSObject *objCons = exec->lexicalInterpreter()->builtinObject();
-  JSObject *prototype = objCons->construct(exec,List::empty());
-  prototype->put(exec, constructorPropertyName, fimp, DontEnum|DontDelete|ReadOnly);
-  fimp->put(exec, prototypePropertyName, prototype, Internal|DontDelete);
+  JSObject* objCons = exec->lexicalInterpreter()->builtinObject();
+  JSObject* prototype = objCons->construct(exec,List::empty());
+  prototype->put(exec, exec->propertyNames().constructor, fimp, DontEnum|DontDelete|ReadOnly);
+  fimp->put(exec, exec->propertyNames().prototype, prototype, Internal|DontDelete);
   return fimp;
 }

trunk/JavaScriptCore/kjs/grammar.y

@@ -33 +33 @@
 #include "lexer.h"
 #include "internal.h"
-
+#include "CommonIdentifiers.h"
+    
 // Not sure why, but yacc doesn't add this define along with the others.
 #define yylloc kjsyylloc
@@ -816 +817 @@
 
 TryStatement:
-    TRY Block FINALLY Block             { $$ = new TryNode($2, Identifier::null(), 0, $4); DBG($$, @1, @2); }
+TRY Block FINALLY Block             { $$ = new TryNode($2, CommonIdentifiers::shared()->nullIdentifier, 0, $4); DBG($$, @1, @2); }
   | TRY Block CATCH '(' IDENT ')' Block { $$ = new TryNode($2, *$5, $7, 0); DBG($$, @1, @2); }
   | TRY Block CATCH '(' IDENT ')' Block FINALLY Block
@@ -834 +835 @@
 
 FunctionExpr:
-    FUNCTION '(' ')' FunctionBody       { $$ = new FuncExprNode(Identifier::null(), $4); }
+    FUNCTION '(' ')' FunctionBody       { $$ = new FuncExprNode(CommonIdentifiers::shared()->nullIdentifier, $4); }
   | FUNCTION '(' FormalParameterList ')' FunctionBody
-                                        { $$ = new FuncExprNode(Identifier::null(), $5, $3); }
+                                        { $$ = new FuncExprNode(CommonIdentifiers::shared()->nullIdentifier, $5, $3); }
   | FUNCTION IDENT '(' ')' FunctionBody { $$ = new FuncExprNode(*$2, $5); }
   | FUNCTION IDENT '(' FormalParameterList ')' FunctionBody
@@ -1002 +1003 @@
     
     result = new PropertyNode(new PropertyNameNode(name), 
-                              new FuncExprNode(Identifier::null(), body, params), type);
+                              new FuncExprNode(CommonIdentifiers::shared()->nullIdentifier, body, params), type);
 
     return true;

trunk/JavaScriptCore/kjs/identifier.cpp

@@ -21 +21 @@
 
 #include "config.h"
-// For JavaScriptCore we need to avoid having static constructors.
-// Our strategy is to declare the global objects with a different type (initialized to 0)
-// and then use placement new to initialize the global objects later. This is not completely
-// portable, and it would be good to figure out a 100% clean way that still avoids code that
-// runs at init time.
-
-#if !PLATFORM(WIN_OS) // can't get this to compile on Visual C++ yet
-#define AVOID_STATIC_CONSTRUCTORS 1
-#else
-#define AVOID_STATIC_CONSTRUCTORS 0
-#endif
-
-#if AVOID_STATIC_CONSTRUCTORS
-#define KJS_IDENTIFIER_HIDE_GLOBALS 1
-#endif
 
 #include "identifier.h"
@@ -210 +195 @@
 }
 
-// Global constants for property name strings.
-
-#if !AVOID_STATIC_CONSTRUCTORS
-    // Define an Identifier in the normal way.
-    #define DEFINE_GLOBAL(name, string) extern const Identifier name(string);
-#else
-    // Define an Identifier-sized array of pointers to avoid static initialization.
-    // Use an array of pointers instead of an array of char in case there is some alignment issue.
-    #define DEFINE_GLOBAL(name, string) \
-        void * name[(sizeof(Identifier) + sizeof(void *) - 1) / sizeof(void *)];
-#endif
-
-const char * const nullCString = 0;
-
-DEFINE_GLOBAL(nullIdentifier, nullCString)
-DEFINE_GLOBAL(specialPrototypePropertyName, "__proto__")
-
-#define DEFINE_PROPERTY_NAME_GLOBAL(name) DEFINE_GLOBAL(name ## PropertyName, #name)
-KJS_IDENTIFIER_EACH_PROPERTY_NAME_GLOBAL(DEFINE_PROPERTY_NAME_GLOBAL)
-
-void Identifier::init()
-{
-#if AVOID_STATIC_CONSTRUCTORS
-    static bool initialized;
-    if (!initialized) {
-        // Use placement new to initialize the globals.
-
-        new (&nullIdentifier) Identifier(nullCString);
-        new (&specialPrototypePropertyName) Identifier("__proto__");
-
-        #define PLACEMENT_NEW_PROPERTY_NAME_GLOBAL(name) new(&name ## PropertyName) Identifier(#name);
-        KJS_IDENTIFIER_EACH_PROPERTY_NAME_GLOBAL(PLACEMENT_NEW_PROPERTY_NAME_GLOBAL)
-
-        initialized = true;
-    }
-#endif
-}
-
 } // namespace KJS

trunk/JavaScriptCore/kjs/identifier.h

@@ -30 +30 @@
         friend class PropertyMap;
     public:
-        static void init();
-
         Identifier() { }
         Identifier(const char* s) : _ustring(add(s)) { }
@@ -57 +55 @@
         double toDouble() const { return _ustring.toDouble(); }
         
-        static const Identifier& null();
-        
         friend bool operator==(const Identifier&, const Identifier&);
         friend bool operator!=(const Identifier&, const Identifier&);
@@ -83 +79 @@
     };
     
-#ifndef KJS_IDENTIFIER_HIDE_GLOBALS
-    extern const Identifier nullIdentifier;
-
-    inline const Identifier& Identifier::null()
-        { return nullIdentifier; }
-#endif
-
     inline bool operator==(const Identifier& a, const Identifier& b)
         { return Identifier::equal(a, b); }
@@ -99 +88 @@
         { return Identifier::equal(a, b); }
 
-    // List of property names, passed to a macro so we can do set them up various
-    // ways without repeating the list.
-    #define KJS_IDENTIFIER_EACH_PROPERTY_NAME_GLOBAL(macro) \
-        macro(arguments) \
-        macro(callee) \
-        macro(caller) \
-        macro(constructor) \
-        macro(fromCharCode) \
-        macro(length) \
-        macro(message) \
-        macro(name) \
-        macro(prototype) \
-        macro(toLocaleString) \
-        macro(toString) \
-        macro(toFixed) \
-        macro(toExponential) \
-        macro(toPrecision) \
-        macro(valueOf)
-
-    // Define external global variables for all property names above (and one more).
-#ifndef KJS_IDENTIFIER_HIDE_GLOBALS
-    extern const Identifier specialPrototypePropertyName;
-
-    #define KJS_IDENTIFIER_DECLARE_PROPERTY_NAME_GLOBAL(name) extern const Identifier name ## PropertyName;
-    KJS_IDENTIFIER_EACH_PROPERTY_NAME_GLOBAL(KJS_IDENTIFIER_DECLARE_PROPERTY_NAME_GLOBAL)
-    #undef KJS_IDENTIFIER_DECLARE_PROPERTY_NAME_GLOBAL
-#endif
-
 } // namespace KJS
 

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -97 +97 @@
     JSLock lock;
 
-    Identifier::init();
-
     m_refCount = 0;
     m_timeoutTime = 0;
@@ -109 +107 @@
     
     m_compatMode = NativeMode;
-    m_argumentsPropertyName = &argumentsPropertyName;
-    m_specialPrototypePropertyName = &specialPrototypePropertyName;
 
     if (s_hook) {
@@ -228 +224 @@
     m_UriError = new NativeErrorImp(&m_globalExec, m_FunctionPrototype, m_UriErrorPrototype);
     
-    m_FunctionPrototype->put(&m_globalExec, constructorPropertyName, m_Function, DontEnum);
-    m_ObjectPrototype->put(&m_globalExec, constructorPropertyName, m_Object, DontEnum | DontDelete | ReadOnly);
-    m_FunctionPrototype->put(&m_globalExec, constructorPropertyName, m_Function, DontEnum | DontDelete | ReadOnly);
-    m_ArrayPrototype->put(&m_globalExec, constructorPropertyName, m_Array, DontEnum | DontDelete | ReadOnly);
-    m_BooleanPrototype->put(&m_globalExec, constructorPropertyName, m_Boolean, DontEnum | DontDelete | ReadOnly);
-    m_StringPrototype->put(&m_globalExec, constructorPropertyName, m_String, DontEnum | DontDelete | ReadOnly);
-    m_NumberPrototype->put(&m_globalExec, constructorPropertyName, m_Number, DontEnum | DontDelete | ReadOnly);
-    m_DatePrototype->put(&m_globalExec, constructorPropertyName, m_Date, DontEnum | DontDelete | ReadOnly);
-    m_RegExpPrototype->put(&m_globalExec, constructorPropertyName, m_RegExp, DontEnum | DontDelete | ReadOnly);
-    m_ErrorPrototype->put(&m_globalExec, constructorPropertyName, m_Error, DontEnum | DontDelete | ReadOnly);
-    m_EvalErrorPrototype->put(&m_globalExec, constructorPropertyName, m_EvalError, DontEnum | DontDelete | ReadOnly);
-    m_RangeErrorPrototype->put(&m_globalExec, constructorPropertyName, m_RangeError, DontEnum | DontDelete | ReadOnly);
-    m_ReferenceErrorPrototype->put(&m_globalExec, constructorPropertyName, m_ReferenceError, DontEnum | DontDelete | ReadOnly);
-    m_SyntaxErrorPrototype->put(&m_globalExec, constructorPropertyName, m_SyntaxError, DontEnum | DontDelete | ReadOnly);
-    m_TypeErrorPrototype->put(&m_globalExec, constructorPropertyName, m_TypeError, DontEnum | DontDelete | ReadOnly);
-    m_UriErrorPrototype->put(&m_globalExec, constructorPropertyName, m_UriError, DontEnum | DontDelete | ReadOnly);
+    m_FunctionPrototype->put(&m_globalExec, m_globalExec.propertyNames().constructor, m_Function, DontEnum);
+    m_ObjectPrototype->put(&m_globalExec, m_globalExec.propertyNames().constructor, m_Object, DontEnum | DontDelete | ReadOnly);
+    m_FunctionPrototype->put(&m_globalExec, m_globalExec.propertyNames().constructor, m_Function, DontEnum | DontDelete | ReadOnly);
+    m_ArrayPrototype->put(&m_globalExec, m_globalExec.propertyNames().constructor, m_Array, DontEnum | DontDelete | ReadOnly);
+    m_BooleanPrototype->put(&m_globalExec, m_globalExec.propertyNames().constructor, m_Boolean, DontEnum | DontDelete | ReadOnly);
+    m_StringPrototype->put(&m_globalExec, m_globalExec.propertyNames().constructor, m_String, DontEnum | DontDelete | ReadOnly);
+    m_NumberPrototype->put(&m_globalExec, m_globalExec.propertyNames().constructor, m_Number, DontEnum | DontDelete | ReadOnly);
+    m_DatePrototype->put(&m_globalExec, m_globalExec.propertyNames().constructor, m_Date, DontEnum | DontDelete | ReadOnly);
+    m_RegExpPrototype->put(&m_globalExec, m_globalExec.propertyNames().constructor, m_RegExp, DontEnum | DontDelete | ReadOnly);
+    m_ErrorPrototype->put(&m_globalExec, m_globalExec.propertyNames().constructor, m_Error, DontEnum | DontDelete | ReadOnly);
+    m_EvalErrorPrototype->put(&m_globalExec, m_globalExec.propertyNames().constructor, m_EvalError, DontEnum | DontDelete | ReadOnly);
+    m_RangeErrorPrototype->put(&m_globalExec, m_globalExec.propertyNames().constructor, m_RangeError, DontEnum | DontDelete | ReadOnly);
+    m_ReferenceErrorPrototype->put(&m_globalExec, m_globalExec.propertyNames().constructor, m_ReferenceError, DontEnum | DontDelete | ReadOnly);
+    m_SyntaxErrorPrototype->put(&m_globalExec, m_globalExec.propertyNames().constructor, m_SyntaxError, DontEnum | DontDelete | ReadOnly);
+    m_TypeErrorPrototype->put(&m_globalExec, m_globalExec.propertyNames().constructor, m_TypeError, DontEnum | DontDelete | ReadOnly);
+    m_UriErrorPrototype->put(&m_globalExec, m_globalExec.propertyNames().constructor, m_UriError, DontEnum | DontDelete | ReadOnly);
 
     // Set global object prototype

trunk/JavaScriptCore/kjs/interpreter.h

@@ -328 +328 @@
     virtual bool isSafeScript(const Interpreter*) { return true; }
   
-    // This is a workaround to avoid accessing the global variables for these identifiers in
-    // important property lookup functions, to avoid taking PIC branches in Mach-O binaries
-    const Identifier& argumentsIdentifier() { return *m_argumentsPropertyName; }
-    const Identifier& specialPrototypeIdentifier() { return *m_specialPrototypePropertyName; }
-    
     // Chained list of interpreters (ring)
     static Interpreter* firstInterpreter() { return s_hook; }
@@ -376 +371 @@
     
     ExecState m_globalExec;
-
-    const Identifier *m_argumentsPropertyName;
-    const Identifier *m_specialPrototypePropertyName;
 
     // Chained list of interpreters (ring) - for collector

trunk/JavaScriptCore/kjs/lookup.h

@@ -353 +353 @@
       , id(i) \
     { \
-       put(exec, lengthPropertyName, jsNumber(len), DontDelete|ReadOnly|DontEnum); \
+       put(exec, exec->propertyNames().length, jsNumber(len), DontDelete|ReadOnly|DontEnum); \
     } \
     /* Macro user needs to implement the callAsFunction function. */ \

trunk/JavaScriptCore/kjs/math_object.cpp

@@ -122 +122 @@
   , id(i)
 {
-  putDirect(lengthPropertyName, l, DontDelete|ReadOnly|DontEnum);
+  putDirect(exec->propertyNames().length, l, DontDelete|ReadOnly|DontEnum);
 }
 

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -446 +446 @@
     array = static_cast<JSObject*>(element->evaluate(exec));
     KJS_CHECKEXCEPTIONVALUE
-    length = opt ? array->get(exec,lengthPropertyName)->toInt32(exec) : 0;
+    length = opt ? array->get(exec, exec->propertyNames().length)->toInt32(exec) : 0;
   } else {
     JSValue *newArr = exec->lexicalInterpreter()->builtinArray()->construct(exec,List::empty());
@@ -454 +454 @@
 
   if (opt)
-    array->put(exec,lengthPropertyName, jsNumber(elision + length), DontEnum | DontDelete);
+    array->put(exec, exec->propertyNames().length, jsNumber(elision + length), DontEnum | DontDelete);
 
   return array;
@@ -2370 +2370 @@
 
   JSObject *proto = exec->lexicalInterpreter()->builtinObject()->construct(exec, List::empty());
-  proto->put(exec, constructorPropertyName, func, ReadOnly|DontDelete|DontEnum);
-  func->put(exec, prototypePropertyName, proto, Internal|DontDelete);
+  proto->put(exec, exec->propertyNames().constructor, func, ReadOnly | DontDelete | DontEnum);
+  func->put(exec, exec->propertyNames().prototype, proto, Internal|DontDelete);
 
   int plen = 0;
@@ -2377 +2377 @@
     func->addParameter(p->ident());
 
-  func->put(exec, lengthPropertyName, jsNumber(plen), ReadOnly|DontDelete|DontEnum);
+  func->put(exec, exec->propertyNames().length, jsNumber(plen), ReadOnly|DontDelete|DontEnum);
 
   // ECMA 10.2.2
@@ -2416 +2416 @@
   }
 
-  FunctionImp *func = new DeclaredFunctionImp(exec, ident, body.get(), context->scopeChain());
-  JSObject *proto = exec->lexicalInterpreter()->builtinObject()->construct(exec, List::empty());
-  proto->put(exec, constructorPropertyName, func, ReadOnly|DontDelete|DontEnum);
-  func->put(exec, prototypePropertyName, proto, Internal|DontDelete);
+  FunctionImp* func = new DeclaredFunctionImp(exec, ident, body.get(), context->scopeChain());
+  JSObject* proto = exec->lexicalInterpreter()->builtinObject()->construct(exec, List::empty());
+  proto->put(exec, exec->propertyNames().constructor, func, ReadOnly | DontDelete | DontEnum);
+  func->put(exec, exec->propertyNames().prototype, proto, Internal | DontDelete);
 
   int plen = 0;

trunk/JavaScriptCore/kjs/number_object.cpp

@@ -53 +53 @@
   // The constructor will be added later, after NumberObjectImp has been constructed
 
-  putDirectFunction(new NumberProtoFunc(exec, funcProto, NumberProtoFunc::ToString,       1, toStringPropertyName), DontEnum);
-  putDirectFunction(new NumberProtoFunc(exec, funcProto, NumberProtoFunc::ToLocaleString, 0, toLocaleStringPropertyName), DontEnum);
-  putDirectFunction(new NumberProtoFunc(exec, funcProto, NumberProtoFunc::ValueOf,        0, valueOfPropertyName), DontEnum);
-  putDirectFunction(new NumberProtoFunc(exec, funcProto, NumberProtoFunc::ToFixed,        1, toFixedPropertyName), DontEnum);
-  putDirectFunction(new NumberProtoFunc(exec, funcProto, NumberProtoFunc::ToExponential,  1, toExponentialPropertyName), DontEnum);
-  putDirectFunction(new NumberProtoFunc(exec, funcProto, NumberProtoFunc::ToPrecision,    1, toPrecisionPropertyName), DontEnum);
+  putDirectFunction(new NumberProtoFunc(exec, funcProto, NumberProtoFunc::ToString,       1, exec->propertyNames().toString), DontEnum);
+  putDirectFunction(new NumberProtoFunc(exec, funcProto, NumberProtoFunc::ToLocaleString, 0, exec->propertyNames().toLocaleString), DontEnum);
+  putDirectFunction(new NumberProtoFunc(exec, funcProto, NumberProtoFunc::ValueOf,        0, exec->propertyNames().valueOf), DontEnum);
+  putDirectFunction(new NumberProtoFunc(exec, funcProto, NumberProtoFunc::ToFixed,        1, exec->propertyNames().toFixed), DontEnum);
+  putDirectFunction(new NumberProtoFunc(exec, funcProto, NumberProtoFunc::ToExponential,  1, exec->propertyNames().toExponential), DontEnum);
+  putDirectFunction(new NumberProtoFunc(exec, funcProto, NumberProtoFunc::ToPrecision,    1, exec->propertyNames().toPrecision), DontEnum);
 }
 
@@ -64 +64 @@
 // ------------------------------ NumberProtoFunc ---------------------------
 
-NumberProtoFunc::NumberProtoFunc(ExecState*, FunctionPrototype* funcProto, int i, int len, const Identifier& name)
+NumberProtoFunc::NumberProtoFunc(ExecState* exec, FunctionPrototype* funcProto, int i, int len, const Identifier& name)
    : InternalFunctionImp(funcProto, name)
    , id(i)
 {
-  putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
+  putDirect(exec->propertyNames().length, len, DontDelete|ReadOnly|DontEnum);
 }
 
@@ -417 +417 @@
 @end
 */
-NumberObjectImp::NumberObjectImp(ExecState*, FunctionPrototype* funcProto, NumberPrototype* numberProto)
+NumberObjectImp::NumberObjectImp(ExecState* exec, FunctionPrototype* funcProto, NumberPrototype* numberProto)
   : InternalFunctionImp(funcProto)
 {
   // Number.Prototype
-  putDirect(prototypePropertyName, numberProto,DontEnum|DontDelete|ReadOnly);
+  putDirect(exec->propertyNames().prototype, numberProto,DontEnum|DontDelete|ReadOnly);
 
   // no. of arguments for constructor
-  putDirect(lengthPropertyName, jsNumber(1), ReadOnly|DontDelete|DontEnum);
+  putDirect(exec->propertyNames().length, jsNumber(1), ReadOnly|DontDelete|DontEnum);
 }
 

trunk/JavaScriptCore/kjs/object.cpp

@@ -206 +206 @@
 
 // ECMA 8.6.2.2
-void JSObject::put(ExecState *exec, const Identifier &propertyName, JSValue *value, int attr)
+void JSObject::put(ExecState* exec, const Identifier &propertyName, JSValue *value, int attr)
 {
   assert(value);
 
   // non-standard netscape extension
-  if (propertyName == exec->dynamicInterpreter()->specialPrototypeIdentifier()) {
+  if (propertyName == exec->propertyNames().underscoreProto) {
     setPrototype(value);
     return;
@@ -354 +354 @@
 
 // ECMA 8.6.2.6
-JSValue *JSObject::defaultValue(ExecState *exec, JSType hint) const
+JSValue* JSObject::defaultValue(ExecState* exec, JSType hint) const
 {
   Identifier firstPropertyName;
@@ -360 +360 @@
   /* Prefer String for Date objects */
   if ((hint == StringType) || (hint != StringType) && (hint != NumberType) && (_proto == exec->lexicalInterpreter()->builtinDatePrototype())) {
-    firstPropertyName = toStringPropertyName;
-    secondPropertyName = valueOfPropertyName;
+    firstPropertyName = exec->propertyNames().toString;
+    secondPropertyName = exec->propertyNames().valueOf;
   } else {
-    firstPropertyName = valueOfPropertyName;
-    secondPropertyName = toStringPropertyName;
+    firstPropertyName = exec->propertyNames().valueOf;
+    secondPropertyName = exec->propertyNames().toString;
   }
 
@@ -456 +456 @@
 bool JSObject::hasInstance(ExecState* exec, JSValue* value)
 {
-    JSValue* proto = get(exec, prototypePropertyName);
+    JSValue* proto = get(exec, exec->propertyNames().prototype);
     if (!proto->isObject()) {
         throwError(exec, TypeError, "intanceof called on an object with an invalid prototype property.");

trunk/JavaScriptCore/kjs/object.h

@@ -27 +27 @@
 
 #include "JSType.h"
+#include "CommonIdentifiers.h"
 #include "interpreter.h"
 #include "property_map.h"
@@ -246 +247 @@
      * @param propertyValue The value to set
      */
-    virtual void put(ExecState *exec, const Identifier &propertyName, JSValue *value, int attr = None);
-    virtual void put(ExecState *exec, unsigned propertyName, JSValue *value, int attr = None);
+    virtual void put(ExecState* exec, const Identifier &propertyName, JSValue* value, int attr = None);
+    virtual void put(ExecState* exec, unsigned propertyName, JSValue* value, int attr = None);
 
     /**
@@ -565 +566 @@
 // but it makes a big difference to property lookup that derived classes can inline their
 // base class call to this.
-ALWAYS_INLINE bool JSObject::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
+ALWAYS_INLINE bool JSObject::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
 {
     if (JSValue **location = getDirectLocation(propertyName)) {
@@ -576 +577 @@
 
     // non-standard Netscape extension
-    if (propertyName == exec->dynamicInterpreter()->specialPrototypeIdentifier()) {
+    if (propertyName == exec->propertyNames().underscoreProto) {
         slot.setValueSlot(this, &_proto);
         return true;

trunk/JavaScriptCore/kjs/object_object.cpp

@@ -42 +42 @@
     static const Identifier* lookupSetterPropertyName = new Identifier("__lookupSetter__");
 
-    putDirectFunction(new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::ToString, 0, toStringPropertyName), DontEnum);
-    putDirectFunction(new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::ToLocaleString, 0, toLocaleStringPropertyName), DontEnum);
-    putDirectFunction(new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::ValueOf, 0, valueOfPropertyName), DontEnum);
+    putDirectFunction(new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::ToString, 0, exec->propertyNames().toString), DontEnum);
+    putDirectFunction(new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::ToLocaleString, 0, exec->propertyNames().toLocaleString), DontEnum);
+    putDirectFunction(new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::ValueOf, 0, exec->propertyNames().valueOf), DontEnum);
     putDirectFunction(new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::HasOwnProperty, 1, *hasOwnPropertyPropertyName), DontEnum);
     putDirectFunction(new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::PropertyIsEnumerable, 1, *propertyIsEnumerablePropertyName), DontEnum);
@@ -59 +59 @@
 // ------------------------------ ObjectProtoFunc --------------------------------
 
-ObjectProtoFunc::ObjectProtoFunc(ExecState*, FunctionPrototype* funcProto, int i, int len, const Identifier& name)
+ObjectProtoFunc::ObjectProtoFunc(ExecState* exec, FunctionPrototype* funcProto, int i, int len, const Identifier& name)
   : InternalFunctionImp(funcProto, name)
   , id(i)
 {
-  putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
+  putDirect(exec->propertyNames().length, len, DontDelete|ReadOnly|DontEnum);
 }
 
@@ -154 +154 @@
 // ------------------------------ ObjectObjectImp --------------------------------
 
-ObjectObjectImp::ObjectObjectImp(ExecState*, ObjectPrototype* objProto, FunctionPrototype* funcProto)
+ObjectObjectImp::ObjectObjectImp(ExecState* exec, ObjectPrototype* objProto, FunctionPrototype* funcProto)
   : InternalFunctionImp(funcProto)
 {
   // ECMA 15.2.3.1
-  putDirect(prototypePropertyName, objProto, DontEnum|DontDelete|ReadOnly);
+  putDirect(exec->propertyNames().prototype, objProto, DontEnum|DontDelete|ReadOnly);
 
   // no. of arguments for constructor
-  putDirect(lengthPropertyName, jsNumber(1), ReadOnly|DontDelete|DontEnum);
+  putDirect(exec->propertyNames().length, jsNumber(1), ReadOnly|DontDelete|DontEnum);
 }
 

trunk/JavaScriptCore/kjs/regexp_object.cpp

@@ -54 +54 @@
   putDirectFunction(new RegExpProtoFunc(exec, funcProto, RegExpProtoFunc::Exec, 0, *execPropertyName), DontEnum);
   putDirectFunction(new RegExpProtoFunc(exec, funcProto, RegExpProtoFunc::Test, 0, *testPropertyName), DontEnum);
-  putDirectFunction(new RegExpProtoFunc(exec, funcProto, RegExpProtoFunc::ToString, 0, toStringPropertyName), DontEnum);
+  putDirectFunction(new RegExpProtoFunc(exec, funcProto, RegExpProtoFunc::ToString, 0, exec->propertyNames().toString), DontEnum);
 }
 
 // ------------------------------ RegExpProtoFunc ---------------------------
 
-RegExpProtoFunc::RegExpProtoFunc(ExecState*, FunctionPrototype* funcProto, int i, int len, const Identifier& name)
+RegExpProtoFunc::RegExpProtoFunc(ExecState* exec, FunctionPrototype* funcProto, int i, int len, const Identifier& name)
    : InternalFunctionImp(funcProto, name), id(i)
 {
-  putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
+  putDirect(exec->propertyNames().length, len, DontDelete | ReadOnly | DontEnum);
 }
 
@@ -181 +181 @@
 */
 
-RegExpObjectImp::RegExpObjectImp(ExecState*, FunctionPrototype* funcProto, RegExpPrototype* regProto)
+RegExpObjectImp::RegExpObjectImp(ExecState* exec, FunctionPrototype* funcProto, RegExpPrototype* regProto)
 
   : InternalFunctionImp(funcProto), lastInput(""), lastNumSubPatterns(0), multiline(false)
 {
   // ECMA 15.10.5.1 RegExp.prototype
-  putDirect(prototypePropertyName, regProto, DontEnum|DontDelete|ReadOnly);
+  putDirect(exec->propertyNames().prototype, regProto, DontEnum | DontDelete | ReadOnly);
 
   // no. of arguments for constructor
-  putDirect(lengthPropertyName, jsNumber(2), ReadOnly|DontDelete|DontEnum);
+  putDirect(exec->propertyNames().length, jsNumber(2), ReadOnly | DontDelete | DontEnum);
 }
 

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -71 +71 @@
 bool StringInstance::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot &slot)
 {
-  if (propertyName == lengthPropertyName) {
+  if (propertyName == exec->propertyNames().length) {
     slot.setCustom(this, lengthGetter);
     return true;
@@ -92 +92 @@
 void StringInstance::put(ExecState *exec, const Identifier &propertyName, JSValue *value, int attr)
 {
-  if (propertyName == lengthPropertyName)
+  if (propertyName == exec->propertyNames().length)
     return;
   JSObject::put(exec, propertyName, value, attr);
@@ -99 +99 @@
 bool StringInstance::deleteProperty(ExecState *exec, const Identifier &propertyName)
 {
-  if (propertyName == lengthPropertyName)
+  if (propertyName == exec->propertyNames().length)
     return false;
   return JSObject::deleteProperty(exec, propertyName);
@@ -155 +155 @@
 */
 // ECMA 15.5.4
-StringPrototype::StringPrototype(ExecState*, ObjectPrototype* objProto)
+StringPrototype::StringPrototype(ExecState* exec, ObjectPrototype* objProto)
   : StringInstance(objProto)
 {
   // The constructor will be added later, after StringObjectImp has been built
-  putDirect(lengthPropertyName, jsNumber(0), DontDelete|ReadOnly|DontEnum);
+  putDirect(exec->propertyNames().length, jsNumber(0), DontDelete | ReadOnly | DontEnum);
 }
 
@@ -169 +169 @@
 // ------------------------------ StringProtoFunc ---------------------------
 
-StringProtoFunc::StringProtoFunc(ExecState *exec, int i, int len, const Identifier& name)
+StringProtoFunc::StringProtoFunc(ExecState* exec, int i, int len, const Identifier& name)
   : InternalFunctionImp(static_cast<FunctionPrototype*>(exec->lexicalInterpreter()->builtinFunctionPrototype()), name)
   , id(i)
 {
-  putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);
+  putDirect(exec->propertyNames().length, len, DontDelete | ReadOnly | DontEnum);
 }
 
@@ -419 +419 @@
 
 // ECMA 15.5.4.2 - 15.5.4.20
-JSValue *StringProtoFunc::callAsFunction(ExecState *exec, JSObject *thisObj, const List &args)
-{
-  JSValue *result = NULL;
+JSValue* StringProtoFunc::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+{
+  JSValue* result = NULL;
 
   // toString and valueOf are no generic function.
@@ -591 +591 @@
       if (u.isEmpty() && !reg->match(u, 0).isNull()) {
         // empty string matched by regexp -> empty array
-        res->put(exec,lengthPropertyName, jsNumber(0));
+        res->put(exec, exec->propertyNames().length, jsNumber(0));
         break;
       }
@@ -615 +615 @@
         if (u.isEmpty()) {
           // empty separator matches empty string -> empty array
-          put(exec,lengthPropertyName, jsNumber(0));
+          put(exec, exec->propertyNames().length, jsNumber(0));
           break;
         } else {
@@ -632 +632 @@
     if (static_cast<uint32_t>(i) != limit)
       res->put(exec, i++, jsString(u.substr(p0)));
-    res->put(exec,lengthPropertyName, jsNumber(i));
+    res->put(exec, exec->propertyNames().length, jsNumber(i));
     }
     break;
@@ -761 +761 @@
 // ------------------------------ StringObjectImp ------------------------------
 
-StringObjectImp::StringObjectImp(ExecState *exec,
-                                 FunctionPrototype *funcProto,
-                                 StringPrototype *stringProto)
+StringObjectImp::StringObjectImp(ExecState* exec,
+                                 FunctionPrototype* funcProto,
+                                 StringPrototype* stringProto)
   : InternalFunctionImp(funcProto)
 {
   // ECMA 15.5.3.1 String.prototype
-  putDirect(prototypePropertyName, stringProto, DontEnum|DontDelete|ReadOnly);
-
-  putDirectFunction(new StringObjectFuncImp(exec, funcProto, fromCharCodePropertyName), DontEnum);
+  putDirect(exec->propertyNames().prototype, stringProto, DontEnum|DontDelete|ReadOnly);
+
+  putDirectFunction(new StringObjectFuncImp(exec, funcProto, exec->propertyNames().fromCharCode), DontEnum);
 
   // no. of arguments for constructor
-  putDirect(lengthPropertyName, jsNumber(1), ReadOnly|DontDelete|DontEnum);
+  putDirect(exec->propertyNames().length, jsNumber(1), ReadOnly|DontDelete|DontEnum);
 }
 
@@ -804 +804 @@
 
 // ECMA 15.5.3.2 fromCharCode()
-StringObjectFuncImp::StringObjectFuncImp(ExecState*, FunctionPrototype* funcProto, const Identifier& name)
+StringObjectFuncImp::StringObjectFuncImp(ExecState* exec, FunctionPrototype* funcProto, const Identifier& name)
   : InternalFunctionImp(funcProto, name)
 {
-  putDirect(lengthPropertyName, jsNumber(1), DontDelete|ReadOnly|DontEnum);
+  putDirect(exec->propertyNames().length, jsNumber(1), DontDelete|ReadOnly|DontEnum);
 }
 

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -119 +119 @@
 TestFunctionImp::TestFunctionImp(int i, int length) : JSObject(), id(i)
 {
-  putDirect(lengthPropertyName,length,DontDelete|ReadOnly|DontEnum);
+  putDirect(Identifier("length"), length, DontDelete | ReadOnly | DontEnum);
 }