Changeset 13703 in webkit for trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

Timestamp:

Apr 5, 2006, 2:19:57 PM (19 years ago)

Author:

darin

Message:

JavaScriptCore:

Reviewed by Maciej.

• JavaScriptCore part of fix for ​http://bugzilla.opendarwin.org/show_bug.cgi?id=8049 StringImpl hash traits deleted value creates an init routine for WebCore <rdar://problem/4442248> REGRESSION: WebCore has init routines (8049)

Change HashMap and HashSet implementation so they fold various types together.
This allows us to implement maps and sets that use RefPtr<WebCore::StringImpl>
and WebCore::String in terms of the underlying raw pointer type, and hence use
-1 for the deleted value.

• kxmlcore/HashTraits.h: Added a new type to HashTraits, StorageTraits, which is a type to be used when storing a value that has the same layout as the type itself. This is used only for non-key cases. In the case of keys, the hash function must also be considered. Moved emptyValue out of GenericHashTraitsBase into GenericHashTraits. Added a new bool to HashTraits, needsRef, which indicates whether the type needs explicit reference counting. If the type itself has needsRef true, but the storage type has needsRef false, then the HashSet or HashMap has to handle the reference counting explicitly. Added hash trait specializations for all signed integer values that give -1 as the deleted value. Gave all integers StorageTraits of the canonical integer type of the same size so int and long will share code. Gave all pointers and RefPtrs StorageTraits of the appropriately sized integer type. Removed redundant TraitType and emptyValue definitions in the pointer specialization for HashTraits. Added PairBaseHashTraits, which doesn't try to set up needsDestruction and deletedValue. Useful for types where we don't want to force the existence of deletedValue, such as the type of a pair in a HashMap which is not the actual storage type. Removed an unneeded parameter from the DeletedValueAssigner template. Added HashKeyStorageTraits template, which determines what type can be used to store a given hash key type with a given hash function, and specialized it for pointers and RefPtr so that pointer hash tables share an underlying HashTable that uses IntHash.

• kxmlcore/HashTable.h: Added HashTableConstIteratorAdapter, HashTableIteratorAdapter, NeedsRef, RefCountManagerBase, RefCountManager, HashTableRefCountManagerBase, and HashTableRefCountManager. All are used by both HashSet and HashMap to handle hash tables where the type stored is not the same as the real value type.

• kxmlcore/HashFunctions.h: Added a new struct named IntTypes that finds an integer type given a sizeof value. Renamed pointerHash to intHash and made it use overloading and take integer parameters. Added an IntHash struct which is a hash function that works for integers. Changed PtrHash to call IntHash with an appropriately sized integer. Made IntHash the default hash function for many integer types. Made PtrHash the default hash function for RefPtr as well as for raw pointers.

• kxmlcore/HashSet.h: Changed implementation to use a separate "storage type" derived from the new traits. The HashTable will use the storage type and all necessary translation and ref/deref is done at the HashSet level. Also reorganized the file so that the HashSet is at the top and has no inline implementation inside it so it's easy to read the interface to HashSet.

• kxmlcore/HashMap.h: Changed implementation to use a separate "storage type" derived from the new traits. The HashTable will use the storage type and all necessary translation and ref/deref is done at the HashMap level. Also reorganized the file so that the HashMap is at the top and has no inline implementation inside it so it's easy to read the interface to HashMap.

• kxmlcore/HashMapPtrSpec.h: Removed. Superceded by optimizations in HashMap itself.

• JavaScriptCore.xcodeproj/project.pbxproj: Remove HashMapPtrSpec.h, resort files, and also remove some unnecessary build settings from the aggregate target that generates derived sources.
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Ditto.

WebCore:

Reviewed by Maciej.

• fix for ​http://bugzilla.opendarwin.org/show_bug.cgi?id=8049 StringImpl hash traits deleted value creates an init routine for WebCore <rdar://problem/4442248> REGRESSION: WebCore has init routines (8049)

• platform/StringHash.h: Added. Moved hash functions and such for WebCore::String and friends into this file so we don't have to include the hash traits header everywhere. Changed hashing for WebCore::StringImpl and WebCore::String so that they use a raw pointer for the underlying storage type, taking advantage of the new feature added in JavaScriptCore.

• platform/AtomicString.h: Moved StrHash specialization to StringHash.h.
• platform/PlatformString.h: Moved StrHash specialization to StringHash.h.
• platform/StringImpl.h: Moved StrHash, CaseInsensitiveHash, and HashTraits to StringHash.h. Left DefaultHash behind so that you can't get the wrong hash function by accident if you forget to include "StringHash.h".

• platform/StringImpl.cpp: Added include of StringHash.h and removed RefPtr<StringImpl> HashTraits<RefPtr<StringImpl> >::_deleted, which is the object with a global initializer causing all the trouble!

• kwq/AccessibilityObjectCache.h: Changed hash function to be IntHash instead of PtrHash.

• dom/StyledElement.cpp: Changed MappedAttributeKeyTraits to inherit from the generic traits in KXMLCore so we get a StorageType. Also cleaned up a tiny bit by adding default values to the MappedAttributeKey constructor.

• platform/CharsetNames.cpp: Changed hash traits here to be a new TextEncodingIDHashTraits struct rather than defining new default traits for the integer type since more integer types have default traits in HashTraits.h now. Also added a specialization so this class will share the underlying implementation (since InvalidEncoding happens to be -1).

• bridge/mac/FrameMac.h:
• dom/Document.h:
• dom/xml_tokenizer.h:
• khtml/xsl/XSLTProcessor.h:
• kwq/JavaAppletWidget.h:
• page/FramePrivate.h:
• page/Page.cpp:
• platform/AtomicString.cpp:
• platform/TransferJob.h:
• rendering/render_applet.h: Added include of StringHash.h.

• WebCore.xcodeproj/project.pbxproj: Added StringHash.h. Remove unneeded CREATE_HASH_TABLE variable in build settings. Re-sorted some file lists. Added quotes to the CREATE_HASH_TABLE initialization in the rule that builds generated files. Removed various unneeded build settings for that target as well.

• ForwardingHeaders/kxmlcore/HashTraits.h: Added.

• other minor cleanup

• bridge/mac/FrameMac.mm: Sorted includes.
• dom/Node.cpp: Removed bogus symbol after #endif.

• khtml/xsl/XSLTProcessor.cpp: Sorted includes. Removed redundant using namespace WebCore.
• loader/Cache.cpp: Ditto.

WebKitTools:

Reviewed by Maciej.

• Scripts/check-for-global-initializers: Remove StringImpl from the list of files that are allowed to have global initializers.

File:

• trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (modified) (9 diffs)

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -14 +14 @@
                                 65FB3F6509D11E9100F49DEB /* Generate Derived Sources */,
                         );
-                        buildSettings = {
-                                PRODUCT_NAME = "Generate Derived Sources";
-                        };
-                        dependencies = (
-                        );
                         name = "Derived Sources";
-                        productName = "Generate Derived Sources";
+                        productName = "Derived Sources";
                 };
                 932F5BE30822A1C700736975 /* All */ = {
@@ -50 +45 @@
                 6541BD7408E80A17002CBEE7 /* TCSystemAlloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6541BD7008E80A17002CBEE7 /* TCSystemAlloc.cpp */; };
                 6541BD7508E80A17002CBEE7 /* TCSystemAlloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 6541BD7108E80A17002CBEE7 /* TCSystemAlloc.h */; };
-                6557E8F808EA5D4D0049CDFC /* HashMapPtrSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = 6557E8F708EA5D4D0049CDFC /* HashMapPtrSpec.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 65621E6D089E859700760F35 /* property_slot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65621E6B089E859700760F35 /* property_slot.cpp */; };
                 65621E6E089E859700760F35 /* property_slot.h in Headers */ = {isa = PBXBuildFile; fileRef = 65621E6C089E859700760F35 /* property_slot.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -361 +355 @@
                 6541BD7008E80A17002CBEE7 /* TCSystemAlloc.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TCSystemAlloc.cpp; sourceTree = "<group>"; tabWidth = 8; };
                 6541BD7108E80A17002CBEE7 /* TCSystemAlloc.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = TCSystemAlloc.h; sourceTree = "<group>"; tabWidth = 8; };
-                6557E8F708EA5D4D0049CDFC /* HashMapPtrSpec.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HashMapPtrSpec.h; sourceTree = "<group>"; tabWidth = 8; };
                 6560A4CF04B3B3E7008AE952 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
                 6560A63D04B3B69F008AE952 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
@@ -649 +642 @@
                         isa = PBXGroup;
                         children = (
-                                65D6D87E09B5A32E0002E4D7 /* Platform.h */,
                                 93AA4F770957251F0084B3A7 /* AlwaysInline.h */,
+                                65E217B808E7EECC0023E5F6 /* Assertions.cpp */,
                                 65E217B708E7EECC0023E5F6 /* Assertions.h */,
-                                65E217B808E7EECC0023E5F6 /* Assertions.cpp */,
                                 65E217B908E7EECC0023E5F6 /* FastMalloc.cpp */,
                                 65E217BA08E7EECC0023E5F6 /* FastMalloc.h */,
@@ -659 +651 @@
                                 65DFC92A08EA173A00F7300B /* HashFunctions.h */,
                                 65DFC92B08EA173A00F7300B /* HashMap.h */,
-                                6557E8F708EA5D4D0049CDFC /* HashMapPtrSpec.h */,
                                 65DFC92C08EA173A00F7300B /* HashSet.h */,
                                 65DFC92D08EA173A00F7300B /* HashTable.cpp */,
@@ -669 +660 @@
                                 9303F567099118FA00AD71B8 /* OwnPtr.h */,
                                 6580F795094070560082C219 /* PassRefPtr.h */,
+                                65D6D87E09B5A32E0002E4D7 /* Platform.h */,
                                 65C647B3093EF8D60022C380 /* RefPtr.h */,
                                 6541BD6E08E80A17002CBEE7 /* TCPageMap.h */,
@@ -900 +892 @@
                                 65DFC93408EA173A00F7300B /* HashTable.h in Headers */,
                                 65DFC93508EA173A00F7300B /* HashTraits.h in Headers */,
-                                6557E8F808EA5D4D0049CDFC /* HashMapPtrSpec.h in Headers */,
                                 65D7D19C08F10B5B0015ABD8 /* FastMallocInternal.h in Headers */,
                                 65EA4C9C092AF9E20093D800 /* JSLock.h in Headers */,
@@ -1545 +1536 @@
                         isa = XCBuildConfiguration;
                         buildSettings = {
-                                COPY_PHASE_STRIP = NO;
-                                GCC_DYNAMIC_NO_PIC = NO;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                                GCC_OPTIMIZATION_LEVEL = 0;
                                 PRODUCT_NAME = "Generate Derived Sources";
                         };
@@ -1556 +1543 @@
                         isa = XCBuildConfiguration;
                         buildSettings = {
-                                COPY_PHASE_STRIP = YES;
-                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                 PRODUCT_NAME = "Generate Derived Sources";
-                                ZERO_LINK = NO;
                         };
                         name = Release;