From d11a0c5d91bcf7dd979cb117559095fef4de084d Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Sun, 12 Sep 2021 14:47:20 +1000 Subject: [PATCH] [ORC] Fix out-of-range comparison errors. --- llvm/include/llvm/ExecutionEngine/Orc/Shared/SimpleRemoteEPCUtils.h | 3 +-- llvm/lib/ExecutionEngine/Orc/SimpleRemoteEPC.cpp | 3 +-- llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.cpp | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/llvm/include/llvm/ExecutionEngine/Orc/Shared/SimpleRemoteEPCUtils.h b/llvm/include/llvm/ExecutionEngine/Orc/Shared/SimpleRemoteEPCUtils.h index 7d1df16..84da111 100644 --- a/llvm/include/llvm/ExecutionEngine/Orc/Shared/SimpleRemoteEPCUtils.h +++ b/llvm/include/llvm/ExecutionEngine/Orc/Shared/SimpleRemoteEPCUtils.h @@ -34,8 +34,7 @@ extern const char *DispatchFnName; } // end namespace SimpleRemoteEPCDefaultBootstrapSymbolNames enum class SimpleRemoteEPCOpcode : uint8_t { - FirstOpC, - Setup = FirstOpC, + Setup, Hangup, Result, CallWrapper, diff --git a/llvm/lib/ExecutionEngine/Orc/SimpleRemoteEPC.cpp b/llvm/lib/ExecutionEngine/Orc/SimpleRemoteEPC.cpp index d60a6a2..0405c3b 100644 --- a/llvm/lib/ExecutionEngine/Orc/SimpleRemoteEPC.cpp +++ b/llvm/lib/ExecutionEngine/Orc/SimpleRemoteEPC.cpp @@ -157,8 +157,7 @@ SimpleRemoteEPC::handleMessage(SimpleRemoteEPCOpcode OpC, uint64_t SeqNo, ExecutorAddress TagAddr, SimpleRemoteEPCArgBytesVector ArgBytes) { using UT = std::underlying_type_t; - if (static_cast(OpC) < static_cast(SimpleRemoteEPCOpcode::FirstOpC) || - static_cast(OpC) > static_cast(SimpleRemoteEPCOpcode::LastOpC)) + if (static_cast(OpC) > static_cast(SimpleRemoteEPCOpcode::LastOpC)) return make_error("Unexpected opcode", inconvertibleErrorCode()); diff --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.cpp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.cpp index d3180cc..ce341ff 100644 --- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.cpp +++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.cpp @@ -169,8 +169,7 @@ SimpleRemoteEPCServer::handleMessage(SimpleRemoteEPCOpcode OpC, uint64_t SeqNo, ExecutorAddress TagAddr, SimpleRemoteEPCArgBytesVector ArgBytes) { using UT = std::underlying_type_t; - if (static_cast(OpC) < static_cast(SimpleRemoteEPCOpcode::FirstOpC) || - static_cast(OpC) > static_cast(SimpleRemoteEPCOpcode::LastOpC)) + if (static_cast(OpC) > static_cast(SimpleRemoteEPCOpcode::LastOpC)) return make_error("Unexpected opcode", inconvertibleErrorCode()); -- 2.7.4