RECONSIDER: We've got a lot of selectors with the same name. Include …

…the type in the hash
microsoft · Jan 22, 2018 · 6ae101d · 6ae101d
1 parent 2c628ee
commit 6ae101d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/msvc/libobjc2.vcxproj b/msvc/libobjc2.vcxproj
@@ -51,8 +51,8 @@
     <UseStarboardSourceSdk>true</UseStarboardSourceSdk>
     <StarboardLinkObjCRuntime>false</StarboardLinkObjCRuntime>
     <WINOBJC_SDK_ROOT Condition="'$(WINOBJC_SDK_ROOT)' == ''">..\..\..\..</WINOBJC_SDK_ROOT>
-    <InvariantClangOptions>-DWIN32 -D_WINDOWS -DNO_PTHREADS=1 -DGNUSTEP -D__OBJC_RUNTIME_INTERNAL__=1 -DNO_LEGACY</InvariantClangOptions>
-    <InvariantPreprocessorDefinitions>WIN32;_WINDOWS;UNICODE;_UNICODE;NO_PTHREADS=1;GNUSTEP;__OBJC_RUNTIME_INTERNAL__=1;NO_LEGACY</InvariantPreprocessorDefinitions>
+    <InvariantClangOptions>-DWIN32 -D_WINDOWS -DNO_PTHREADS=1 -DGNUSTEP -D__OBJC_RUNTIME_INTERNAL__=1 -DNO_LEGACY -DWINOBJC_HASH_SELECTOR_TYPES</InvariantClangOptions>
+    <InvariantPreprocessorDefinitions>WIN32;_WINDOWS;UNICODE;_UNICODE;NO_PTHREADS=1;GNUSTEP;__OBJC_RUNTIME_INTERNAL__=1;NO_LEGACY;WINOBJC_HASH_SELECTOR_TYPES</InvariantPreprocessorDefinitions>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/selector_table.c b/selector_table.c
@@ -217,7 +217,7 @@ static inline uint32_t hash_selector(const void *s)
 	{
 		hash = hash * 33 + c;
 	}
-#ifdef TYPE_DEPENDENT_DISPATCH
+#if defined(TYPE_DEPENDENT_DISPATCH) || defined(WINOBJC_HASH_SELECTOR_TYPES)
 	// We can't use all of the values in the type encoding for the hash,
 	// because our equality test is a bit more complex than simple string
 	// encoding (for example, * and ^C have to be considered equivalent, since