From 626a84e3b3606e5ee590844dc2ea7b3290e46f0d Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Wed, 18 Aug 2021 16:28:21 +1000 Subject: [PATCH] [ORC] Remove unused headers. --- .../include/llvm/ExecutionEngine/ExecutionEngine.h | 1 - llvm/include/llvm/ExecutionEngine/Orc/Core.h | 1 - .../llvm/ExecutionEngine/OrcMCJITReplacement.h | 37 ---------------------- .../llvm/ExecutionEngine/OrcV1Deprecation.h | 22 ------------- llvm/include/llvm/module.modulemap | 1 - 5 files changed, 62 deletions(-) delete mode 100644 llvm/include/llvm/ExecutionEngine/OrcMCJITReplacement.h delete mode 100644 llvm/include/llvm/ExecutionEngine/OrcV1Deprecation.h diff --git a/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h b/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h index 2e38651..43c91fb 100644 --- a/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h +++ b/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h @@ -21,7 +21,6 @@ #include "llvm/ADT/StringMap.h" #include "llvm/ADT/StringRef.h" #include "llvm/ExecutionEngine/JITSymbol.h" -#include "llvm/ExecutionEngine/OrcV1Deprecation.h" #include "llvm/IR/DataLayout.h" #include "llvm/IR/Module.h" #include "llvm/Object/Binary.h" diff --git a/llvm/include/llvm/ExecutionEngine/Orc/Core.h b/llvm/include/llvm/ExecutionEngine/Orc/Core.h index e832d8d..03a7b4b 100644 --- a/llvm/include/llvm/ExecutionEngine/Orc/Core.h +++ b/llvm/include/llvm/ExecutionEngine/Orc/Core.h @@ -21,7 +21,6 @@ #include "llvm/ExecutionEngine/JITSymbol.h" #include "llvm/ExecutionEngine/Orc/ExecutorProcessControl.h" #include "llvm/ExecutionEngine/Orc/Shared/WrapperFunctionUtils.h" -#include "llvm/ExecutionEngine/OrcV1Deprecation.h" #include "llvm/Support/Debug.h" #include "llvm/Support/ExtensibleRTTI.h" diff --git a/llvm/include/llvm/ExecutionEngine/OrcMCJITReplacement.h b/llvm/include/llvm/ExecutionEngine/OrcMCJITReplacement.h deleted file mode 100644 index 6cca193..0000000 --- a/llvm/include/llvm/ExecutionEngine/OrcMCJITReplacement.h +++ /dev/null @@ -1,37 +0,0 @@ -//===---- OrcMCJITReplacement.h - Orc-based MCJIT replacement ---*- C++ -*-===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// -// -// This file forces OrcMCJITReplacement to link in on certain operating systems. -// (Windows). -// -//===----------------------------------------------------------------------===// - -#ifndef LLVM_EXECUTIONENGINE_ORCMCJITREPLACEMENT_H -#define LLVM_EXECUTIONENGINE_ORCMCJITREPLACEMENT_H - -#include "llvm/ExecutionEngine/ExecutionEngine.h" -#include - -extern "C" void LLVMLinkInOrcMCJITReplacement(); - -namespace { - struct ForceOrcMCJITReplacementLinking { - ForceOrcMCJITReplacementLinking() { - // We must reference OrcMCJITReplacement in such a way that compilers will - // not delete it all as dead code, even with whole program optimization, - // yet is effectively a NO-OP. As the compiler isn't smart enough to know - // that getenv() never returns -1, this will do the job. - if (std::getenv("bar") != (char*) -1) - return; - - LLVMLinkInOrcMCJITReplacement(); - } - } ForceOrcMCJITReplacementLinking; -} - -#endif diff --git a/llvm/include/llvm/ExecutionEngine/OrcV1Deprecation.h b/llvm/include/llvm/ExecutionEngine/OrcV1Deprecation.h deleted file mode 100644 index 7ed254b..0000000 --- a/llvm/include/llvm/ExecutionEngine/OrcV1Deprecation.h +++ /dev/null @@ -1,22 +0,0 @@ -//===------ OrcV1Deprecation.h - Memory manager for MC-JIT ------*- C++ -*-===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// -// -// Tag for suppressing ORCv1 deprecation warnings. -// -//===----------------------------------------------------------------------===// - -#ifndef LLVM_EXECUTIONENGINE_ORCV1DEPRECATION_H -#define LLVM_EXECUTIONENGINE_ORCV1DEPRECATION_H - -namespace llvm { - -enum ORCv1DeprecationAcknowledgement { AcknowledgeORCv1Deprecation }; - -} // namespace llvm - -#endif // LLVM_EXECUTIONENGINE_ORCV1DEPRECATION_H diff --git a/llvm/include/llvm/module.modulemap b/llvm/include/llvm/module.modulemap index 848fb26..5191962 100644 --- a/llvm/include/llvm/module.modulemap +++ b/llvm/include/llvm/module.modulemap @@ -181,7 +181,6 @@ module LLVM_ExecutionEngine { // translation unit (or none) and aren't part of this module. exclude header "ExecutionEngine/MCJIT.h" exclude header "ExecutionEngine/Interpreter.h" - exclude header "ExecutionEngine/OrcMCJITReplacement.h" // FIXME: These exclude directives were added as a workaround for // and should be removed once it is fixed. -- 2.7.4