Skip to content

Modify __int64 definition in PAL to match the OS definition #77056

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
jkotas merged 6 commits into from
Oct 18, 2022
Merged

Modify __int64 definition in PAL to match the OS definition #77056

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b823cfd
Modify __int64 definition in PAL to match the OS definition
janvorli Oct 14, 2022
92d2787
Fix coreclr tests build
janvorli Oct 14, 2022
4bada87
Fix comment on #endif in jit.h
janvorli Oct 14, 2022
ddafbc2
Reflect PR feedback
janvorli Oct 14, 2022
6d13629
Fix jit source formatting
janvorli Oct 14, 2022
cc99180
Fix FreeBSD build
janvorli Oct 15, 2022
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
Prev Previous commit
Next Next commit
Fix jit source formatting
  • Loading branch information
@janvorli
janvorli committed Oct 14, 2022
commit 6d136290c24fa3c5f44c9c19ddb9339f2532f680
5 changes: 2 additions & 3 deletions src/coreclr/jit/compiler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ inline unsigned genLog2(unsigned __int64 value)
#if defined(HOST_UNIX) && defined(HOST_64BIT)
inline unsigned genLog2(size_t value)
{
return genLog2((unsigned __int64) value);
return genLog2((unsigned __int64)value);
}
#endif // HOST_UNIX && HOST_BIT64

Expand Down Expand Up @@ -1543,8 +1543,7 @@ void GenTree::BashToConst(T value, var_types type /* = TYP_UNDEF */)
{
static_assert_no_msg((std::is_same<T, int32_t>::value || std::is_same<T, int64_t>::value ||
std::is_same<T, long long>::value || std::is_same<T, float>::value ||
std::is_same<T, ssize_t>::value ||
std::is_same<T, double>::value));
std::is_same<T, ssize_t>::value || std::is_same<T, double>::value));

static_assert_no_msg(sizeof(int64_t) == sizeof(long long));

Expand Down
3 changes: 2 additions & 1 deletion src/coreclr/jit/gentree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3287,7 +3287,8 @@ inline void GenTreeIntConCommon::SetIntegralValue(int64_t value)
template <typename T>
inline void GenTreeIntConCommon::SetValueTruncating(T value)
{
static_assert_no_msg((std::is_same<T, int32_t>::value || std::is_same<T, int64_t>::value || std::is_same<T, ssize_t>::value));
static_assert_no_msg(
(std::is_same<T, int32_t>::value || std::is_same<T, int64_t>::value || std::is_same<T, ssize_t>::value));

if (TypeIs(TYP_LONG))
{
Expand Down