Skip to content

Fix: khash with string key not compiling with dmd if inlining enabled #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jblachly merged 1 commit into from
Aug 26, 2020
Merged

Fix: khash with string key not compiling with dmd if inlining enabled #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions dub.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,10 @@
"license": "MIT",
"dependencies": {
},
"buildTypes": {
"unittest-inline": {
"buildOptions": ["unittests", "optimize", "inline"]
}
},
"excludedSourceFiles": ["source/dklib/benchmark_khash.d"]
}
39 changes: 21 additions & 18 deletions source/dklib/khash.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,13 +471,6 @@ pragma(inline, true)
return cast(khint32_t) ((key)>>33^(key)^(key)<<11);
}

khint_t __ac_X31_hash_string(const(char)* s)
{
khint_t h = cast(khint_t)*s;
if (h) for (++s; *s; ++s) h = (h << 5) - h + cast(khint_t)*s;
return h;
}

auto kh_hash_func(T)(T* key)
if(is(T == char) || is(T == const(char)) || is(T == immutable(char)))
{
Expand All @@ -490,17 +483,6 @@ pragma(inline, true)
return (strcmp(a, b) == 0);
}

auto kh_hash_func(T)(T key)
if(isSomeString!T)
{
// rewrite __ac_X31_hash_string for D string/smart array
if (key.length == 0) return 0;
khint_t h = key[0];
for (int i=1; i<key.length; ++i)
h = (h << 5) - h + cast(khint_t) key[i];
return h;
}

bool kh_hash_equal(T)(T a, T b)
if(isSomeString!T)
{
Expand All @@ -523,6 +505,27 @@ pragma(inline, true)
alias kh_int_hash_func2 = __ac_Wang_hash;

} // end pragma(inline, true)

khint_t __ac_X31_hash_string(const(char)* s)
{
version (DigitalMars) {} else pragma(inline, true);
khint_t h = cast(khint_t)*s;
if (h) for (++s; *s; ++s) h = (h << 5) - h + cast(khint_t)*s;
return h;
}

auto kh_hash_func(T)(T key)
if(isSomeString!T)
{
// rewrite __ac_X31_hash_string for D string/smart array
version (DigitalMars) {} else pragma(inline, true);
if (key.length == 0) return 0;
khint_t h = key[0];
for (int i=1; i<key.length; ++i)
h = (h << 5) - h + cast(khint_t) key[i];
return h;
}

} // end template kh_hash

/* --- END OF HASH FUNCTIONS --- */
Expand Down