Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Couple minor fixes
  • Loading branch information
jakobbotsch committed Jun 21, 2022
commit fdf15200b084a6e8872fd942d8eb2eec70034503
12 changes: 6 additions & 6 deletions src/coreclr/jit/gentree.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ enum gtCallTypes : BYTE
CT_COUNT // fake entry (must be last)
};

enum class ExceptionSetFlags
enum class ExceptionSetFlags : uint32_t
{
None = 0x0,
OverflowException = 0x1,
Expand All @@ -143,27 +143,27 @@ enum class ExceptionSetFlags

inline constexpr ExceptionSetFlags operator~(ExceptionSetFlags a)
{
return (ExceptionSetFlags)(~(unsigned short)a);
return (ExceptionSetFlags)(~(uint32_t)a);
}

inline constexpr ExceptionSetFlags operator|(ExceptionSetFlags a, ExceptionSetFlags b)
{
return (ExceptionSetFlags)((unsigned short)a | (unsigned short)b);
return (ExceptionSetFlags)((uint32_t)a | (uint32_t)b);
}

inline constexpr ExceptionSetFlags operator&(ExceptionSetFlags a, ExceptionSetFlags b)
{
return (ExceptionSetFlags)((unsigned short)a & (unsigned short)b);
return (ExceptionSetFlags)((uint32_t)a & (uint32_t)b);
}

inline ExceptionSetFlags& operator|=(ExceptionSetFlags& a, ExceptionSetFlags b)
{
return a = (ExceptionSetFlags)((unsigned short)a | (unsigned short)b);
return a = (ExceptionSetFlags)((uint32_t)a | (uint32_t)b);
}

inline ExceptionSetFlags& operator&=(ExceptionSetFlags& a, ExceptionSetFlags b)
{
return a = (ExceptionSetFlags)((unsigned short)a & (unsigned short)b);
return a = (ExceptionSetFlags)((uint32_t)a & (uint32_t)b);
}

#ifdef DEBUG
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/morph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,7 @@ void CallArgs::ArgsComplete(Compiler* comp, GenTreeCall* call)
{
// If a previous arg may throw a different exception than this arg,
// then we evaluate all previous arguments with GTF_EXCEPT to temps
// to avoid reordering them in our sort late. The only case we can
// to avoid reordering them in our sort later. The only case we can
// avoid this is if all previous args throw the same single
// exception as this arg.
unsigned numExceptions = genCountBits(static_cast<unsigned>(preciseExceptions));
Expand Down