llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-llvm-binary-utilities Author: Brad Smith (brad0) <details> <summary>Changes</summary> Working on preparing a patch to remove the Native Client support now that it is finally reaching end of life. --- Patch is 156.94 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/133661.diff 97 Files Affected: - (modified) clang/include/clang/Basic/TargetInfo.h (-4) - (modified) clang/lib/AST/ASTContext.cpp (-10) - (modified) clang/lib/Basic/CMakeLists.txt (-1) - (modified) clang/lib/Basic/Targets.cpp (-12) - (modified) clang/lib/Basic/Targets/ARM.cpp (-3) - (modified) clang/lib/Basic/Targets/OSTargets.h (-47) - (removed) clang/lib/Basic/Targets/PNaCl.cpp (-29) - (removed) clang/lib/Basic/Targets/PNaCl.h (-90) - (modified) clang/lib/CodeGen/CMakeLists.txt (-1) - (modified) clang/lib/CodeGen/CodeGenModule.cpp (+1-3) - (modified) clang/lib/CodeGen/TargetInfo.h (-3) - (removed) clang/lib/CodeGen/Targets/PNaCl.cpp (-114) - (modified) clang/lib/CodeGen/Targets/X86.cpp (+1-2) - (modified) clang/lib/Driver/CMakeLists.txt (-1) - (modified) clang/lib/Driver/Driver.cpp (-4) - (removed) clang/lib/Driver/ToolChains/NaCl.cpp (-371) - (removed) clang/lib/Driver/ToolChains/NaCl.h (-88) - (modified) clang/lib/Lex/InitHeaderSearch.cpp (-1) - (removed) clang/test/CodeGen/X86/x86_64-arguments-nacl.c (-92) - (modified) clang/test/CodeGen/X86/x86_64-longdouble.c (-16) - (modified) clang/test/CodeGen/arm-aapcs-vfp.c (-6) - (modified) clang/test/CodeGen/ext-int-cc.c (-9) - (modified) clang/test/CodeGen/long_double_fp128.cpp (-4) - (removed) clang/test/CodeGen/malign-double-x86-nacl.c (-43) - (modified) clang/test/CodeGen/target-data.c (-16) - (removed) clang/test/CodeGenCXX/x86_64-arguments-nacl-x32.cpp (-57) - (modified) clang/test/Driver/arm-alignment.c (-6) - (removed) clang/test/Driver/nacl-direct.c (-146) - (modified) clang/test/Driver/unsupported-target-arch.c (-4) - (removed) clang/test/Driver/x86_64-nacl-defines.cpp (-45) - (removed) clang/test/Frontend/x86_64-nacl-types.cpp (-37) - (modified) clang/test/Preprocessor/predefined-macros-no-warnings.c (-4) - (modified) llvm/include/llvm/BinaryFormat/ELF.h (-1) - (modified) llvm/include/llvm/BinaryFormat/MinidumpConstants.def (-1) - (modified) llvm/include/llvm/CodeGen/AtomicExpandUtils.h (+1-2) - (modified) llvm/include/llvm/TargetParser/Triple.h (-6) - (modified) llvm/lib/Target/ARM/ARMAsmPrinter.cpp (-6) - (modified) llvm/lib/Target/ARM/ARMFastISel.cpp (+2-6) - (modified) llvm/lib/Target/ARM/ARMFeatures.td (-6) - (modified) llvm/lib/Target/ARM/ARMFrameLowering.cpp (+1-2) - (modified) llvm/lib/Target/ARM/ARMISelLowering.cpp (+1-6) - (modified) llvm/lib/Target/ARM/ARMInstrInfo.td (+2-18) - (modified) llvm/lib/Target/ARM/ARMPredicates.td (-4) - (modified) llvm/lib/Target/ARM/ARMSubtarget.cpp (+3-3) - (modified) llvm/lib/Target/ARM/ARMSubtarget.h (-1) - (modified) llvm/lib/Target/ARM/ARMTargetMachine.cpp (+2-3) - (modified) llvm/lib/Target/ARM/ARMTargetTransformInfo.h (+3-3) - (modified) llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp (-6) - (modified) llvm/lib/Target/Mips/MCTargetDesc/CMakeLists.txt (-1) - (removed) llvm/lib/Target/Mips/MCTargetDesc/MipsMCNaCl.h (-31) - (modified) llvm/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp (+2-7) - (removed) llvm/lib/Target/Mips/MCTargetDesc/MipsNaClELFStreamer.cpp (-274) - (modified) llvm/lib/Target/Mips/MipsAsmPrinter.cpp (-31) - (modified) llvm/lib/Target/Mips/MipsAsmPrinter.h (-2) - (modified) llvm/lib/Target/Mips/MipsBranchExpansion.cpp (+1-18) - (modified) llvm/lib/Target/Mips/MipsCallingConv.td (+2-9) - (modified) llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp (-13) - (modified) llvm/lib/Target/Mips/MipsInstrFPU.td (+8-10) - (modified) llvm/lib/Target/Mips/MipsInstrInfo.td (-1) - (modified) llvm/lib/Target/Mips/MipsRegisterInfo.cpp (-7) - (modified) llvm/lib/Target/Mips/MipsSubtarget.h (-1) - (modified) llvm/lib/Target/X86/X86ExpandPseudo.cpp (+1-2) - (modified) llvm/lib/Target/X86/X86FrameLowering.cpp (+3-3) - (modified) llvm/lib/Target/X86/X86ISelDAGToDAG.cpp (-4) - (modified) llvm/lib/Target/X86/X86ISelLowering.cpp (+3-5) - (modified) llvm/lib/Target/X86/X86InstrPredicates.td (-2) - (modified) llvm/lib/Target/X86/X86Subtarget.cpp (+2-2) - (modified) llvm/lib/Target/X86/X86Subtarget.h (+2-5) - (modified) llvm/lib/Target/X86/X86TargetMachine.cpp (+3-3) - (modified) llvm/lib/TargetParser/ARMTargetParser.cpp (-1) - (modified) llvm/lib/TargetParser/Triple.cpp (-2) - (modified) llvm/test/CodeGen/ARM/fast-isel-align.ll (-3) - (modified) llvm/test/CodeGen/ARM/struct_byval.ll (-14) - (modified) llvm/test/CodeGen/ARM/trap.ll (-20) - (removed) llvm/test/CodeGen/ARM/varargs-spill-stack-align-nacl.ll (-31) - (modified) llvm/test/CodeGen/Mips/fastcc.ll (-12) - (modified) llvm/test/CodeGen/Mips/fp-indexed-ls.ll (-11) - (modified) llvm/test/CodeGen/Mips/indirect-jump-hazard/long-branch.ll (-1) - (modified) llvm/test/CodeGen/Mips/longbranch.ll (-38) - (removed) llvm/test/CodeGen/Mips/nacl-align.ll (-99) - (removed) llvm/test/CodeGen/Mips/nacl-branch-delay.ll (-71) - (removed) llvm/test/CodeGen/Mips/nacl-reserved-regs.ll (-51) - (modified) llvm/test/CodeGen/X86/constructor.ll (-13) - (modified) llvm/test/CodeGen/X86/fast-isel-x32.ll (-1) - (modified) llvm/test/CodeGen/X86/frameaddr.ll (-11) - (modified) llvm/test/CodeGen/X86/lea-2.ll (-1) - (modified) llvm/test/CodeGen/X86/lea-3.ll (-1) - (modified) llvm/test/CodeGen/X86/lea-4.ll (-1) - (modified) llvm/test/CodeGen/X86/lea-5.ll (-1) - (modified) llvm/test/CodeGen/X86/lea.ll (-1) - (modified) llvm/test/CodeGen/X86/stack-align2.ll (-5) - (modified) llvm/test/CodeGen/X86/x86-64-baseptr.ll (-8) - (modified) llvm/test/CodeGen/X86/x86-64-stack-and-frame-ptr.ll (-9) - (modified) llvm/test/MC/ARM/arm_instructions.s (-6) - (removed) llvm/test/MC/Mips/nacl-mask.s (-319) - (modified) llvm/test/MC/X86/AlignedBundling/labeloffset.s (-4) - (removed) llvm/test/MC/X86/AlignedBundling/rodata-section.s (-30) ``````````diff diff --git a/clang/include/clang/Basic/TargetInfo.h b/clang/include/clang/Basic/TargetInfo.h index 497d68779b92b..3c7f3552e4f49 100644 --- a/clang/include/clang/Basic/TargetInfo.h +++ b/clang/include/clang/Basic/TargetInfo.h @@ -336,10 +336,6 @@ class TargetInfo : public TransferrableTargetInfo, /// http://infocenter.arm.com/help/topic/com.arm.doc.ihi0055a/IHI0055A_aapcs64.pdf AArch64ABIBuiltinVaList, - /// __builtin_va_list as defined by the PNaCl ABI: - /// http://www.chromium.org/nativeclient/pnacl/bitcode-abi#TOC-Machine-Types - PNaClABIBuiltinVaList, - /// __builtin_va_list as defined by the Power ABI: /// https://www.power.org /// /resources/downloads/Power-Arch-32-bit-ABI-supp-1.0-Embedded.pdf diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp index c9d1bea4c623a..1a63646ab534e 100644 --- a/clang/lib/AST/ASTContext.cpp +++ b/clang/lib/AST/ASTContext.cpp @@ -9740,14 +9740,6 @@ CreateX86_64ABIBuiltinVaListDecl(const ASTContext *Context) { return Context->buildImplicitTypedef(VaListTagArrayType, "__builtin_va_list"); } -static TypedefDecl *CreatePNaClABIBuiltinVaListDecl(const ASTContext *Context) { - // typedef int __builtin_va_list[4]; - llvm::APInt Size(Context->getTypeSize(Context->getSizeType()), 4); - QualType IntArrayType = Context->getConstantArrayType( - Context->IntTy, Size, nullptr, ArraySizeModifier::Normal, 0); - return Context->buildImplicitTypedef(IntArrayType, "__builtin_va_list"); -} - static TypedefDecl * CreateAAPCSABIBuiltinVaListDecl(const ASTContext *Context) { // struct __va_list @@ -9945,8 +9937,6 @@ static TypedefDecl *CreateVaListDecl(const ASTContext *Context, return CreatePowerABIBuiltinVaListDecl(Context); case TargetInfo::X86_64ABIBuiltinVaList: return CreateX86_64ABIBuiltinVaListDecl(Context); - case TargetInfo::PNaClABIBuiltinVaList: - return CreatePNaClABIBuiltinVaListDecl(Context); case TargetInfo::AAPCSABIBuiltinVaList: return CreateAAPCSABIBuiltinVaListDecl(Context); case TargetInfo::SystemZBuiltinVaList: diff --git a/clang/lib/Basic/CMakeLists.txt b/clang/lib/Basic/CMakeLists.txt index 331dfbb3f4b67..bb96e3736941f 100644 --- a/clang/lib/Basic/CMakeLists.txt +++ b/clang/lib/Basic/CMakeLists.txt @@ -109,7 +109,6 @@ add_clang_library(clangBasic Targets/Mips.cpp Targets/NVPTX.cpp Targets/OSTargets.cpp - Targets/PNaCl.cpp Targets/PPC.cpp Targets/RISCV.cpp Targets/SPIR.cpp diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index c6d228fe98100..d38c2edc7ebf6 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -29,7 +29,6 @@ #include "Targets/Mips.h" #include "Targets/NVPTX.h" #include "Targets/OSTargets.h" -#include "Targets/PNaCl.h" #include "Targets/PPC.h" #include "Targets/RISCV.h" #include "Targets/SPIR.h" @@ -225,8 +224,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple, return std::make_unique<RTEMSTargetInfo<ARMleTargetInfo>>(Triple, Opts); case llvm::Triple::Haiku: return std::make_unique<HaikuTargetInfo<ARMleTargetInfo>>(Triple, Opts); - case llvm::Triple::NaCl: - return std::make_unique<NaClTargetInfo<ARMleTargetInfo>>(Triple, Opts); case llvm::Triple::Win32: switch (Triple.getEnvironment()) { case llvm::Triple::Cygnus: @@ -257,8 +254,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple, return std::make_unique<NetBSDTargetInfo<ARMbeTargetInfo>>(Triple, Opts); case llvm::Triple::RTEMS: return std::make_unique<RTEMSTargetInfo<ARMbeTargetInfo>>(Triple, Opts); - case llvm::Triple::NaCl: - return std::make_unique<NaClTargetInfo<ARMbeTargetInfo>>(Triple, Opts); default: return std::make_unique<ARMbeTargetInfo>(Triple, Opts); } @@ -301,9 +296,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple, return std::make_unique<FreeBSDTargetInfo<MipsTargetInfo>>(Triple, Opts); case llvm::Triple::NetBSD: return std::make_unique<NetBSDTargetInfo<MipsTargetInfo>>(Triple, Opts); - case llvm::Triple::NaCl: - return std::make_unique<NaClTargetInfo<NaClMips32TargetInfo>>(Triple, - Opts); case llvm::Triple::Win32: switch (Triple.getEnvironment()) { case llvm::Triple::GNU: @@ -585,8 +577,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple, return std::make_unique<HaikuX86_32TargetInfo>(Triple, Opts); case llvm::Triple::RTEMS: return std::make_unique<RTEMSX86_32TargetInfo>(Triple, Opts); - case llvm::Triple::NaCl: - return std::make_unique<NaClTargetInfo<X86_32TargetInfo>>(Triple, Opts); case llvm::Triple::ELFIAMCU: return std::make_unique<MCUX86_32TargetInfo>(Triple, Opts); case llvm::Triple::Hurd: @@ -646,8 +636,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple, } case llvm::Triple::Haiku: return std::make_unique<HaikuTargetInfo<X86_64TargetInfo>>(Triple, Opts); - case llvm::Triple::NaCl: - return std::make_unique<NaClTargetInfo<X86_64TargetInfo>>(Triple, Opts); case llvm::Triple::PS4: return std::make_unique<PS4OSTargetInfo<X86_64TargetInfo>>(Triple, Opts); case llvm::Triple::PS5: diff --git a/clang/lib/Basic/Targets/ARM.cpp b/clang/lib/Basic/Targets/ARM.cpp index ca2c1ffbb0eb7..518e4ec82ca77 100644 --- a/clang/lib/Basic/Targets/ARM.cpp +++ b/clang/lib/Basic/Targets/ARM.cpp @@ -58,9 +58,6 @@ void ARMTargetInfo::setABIAAPCS() { "-a:0:32" "-n32" "-S64"); - } else if (T.isOSNaCl()) { - assert(!BigEndian && "NaCl on ARM does not support big endian"); - resetDataLayout("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S128"); } else { resetDataLayout(BigEndian ? "E-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64" diff --git a/clang/lib/Basic/Targets/OSTargets.h b/clang/lib/Basic/Targets/OSTargets.h index a88c851797aab..dbff025265ee6 100644 --- a/clang/lib/Basic/Targets/OSTargets.h +++ b/clang/lib/Basic/Targets/OSTargets.h @@ -842,53 +842,6 @@ class LLVM_LIBRARY_VISIBILITY WindowsTargetInfo : public OSTargetInfo<Target> { } }; -template <typename Target> -class LLVM_LIBRARY_VISIBILITY NaClTargetInfo : public OSTargetInfo<Target> { -protected: - void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple, - MacroBuilder &Builder) const override { - if (Opts.POSIXThreads) - Builder.defineMacro("_REENTRANT"); - if (Opts.CPlusPlus) - Builder.defineMacro("_GNU_SOURCE"); - - DefineStd(Builder, "unix", Opts); - Builder.defineMacro("__native_client__"); - } - -public: - NaClTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts) - : OSTargetInfo<Target>(Triple, Opts) { - this->LongAlign = 32; - this->LongWidth = 32; - this->PointerAlign = 32; - this->PointerWidth = 32; - this->IntMaxType = TargetInfo::SignedLongLong; - this->Int64Type = TargetInfo::SignedLongLong; - this->DoubleAlign = 64; - this->LongDoubleWidth = 64; - this->LongDoubleAlign = 64; - this->LongLongWidth = 64; - this->LongLongAlign = 64; - this->SizeType = TargetInfo::UnsignedInt; - this->PtrDiffType = TargetInfo::SignedInt; - this->IntPtrType = TargetInfo::SignedInt; - // RegParmMax is inherited from the underlying architecture. - this->LongDoubleFormat = &llvm::APFloat::IEEEdouble(); - if (Triple.getArch() == llvm::Triple::arm) { - // Handled in ARM's setABI(). - } else if (Triple.getArch() == llvm::Triple::x86) { - this->resetDataLayout("e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-" - "i64:64-i128:128-n8:16:32-S128"); - } else if (Triple.getArch() == llvm::Triple::x86_64) { - this->resetDataLayout("e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-" - "i64:64-i128:128-n8:16:32:64-S128"); - } else if (Triple.getArch() == llvm::Triple::mipsel) { - // Handled on mips' setDataLayout. - } - } -}; - // Fuchsia Target template <typename Target> class LLVM_LIBRARY_VISIBILITY FuchsiaTargetInfo : public OSTargetInfo<Target> { diff --git a/clang/lib/Basic/Targets/PNaCl.cpp b/clang/lib/Basic/Targets/PNaCl.cpp deleted file mode 100644 index c4adfbefb9c73..0000000000000 --- a/clang/lib/Basic/Targets/PNaCl.cpp +++ /dev/null @@ -1,29 +0,0 @@ -//===--- PNaCl.cpp - Implement PNaCl target feature support ---------------===// -// -// 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 implements PNaCl TargetInfo objects. -// -//===----------------------------------------------------------------------===// - -#include "PNaCl.h" -#include "clang/Basic/MacroBuilder.h" - -using namespace clang; -using namespace clang::targets; - -ArrayRef<const char *> PNaClTargetInfo::getGCCRegNames() const { return {}; } - -ArrayRef<TargetInfo::GCCRegAlias> PNaClTargetInfo::getGCCRegAliases() const { - return {}; -} - -void PNaClTargetInfo::getArchDefines(const LangOptions &Opts, - MacroBuilder &Builder) const { - Builder.defineMacro("__le32__"); - Builder.defineMacro("__pnacl__"); -} diff --git a/clang/lib/Basic/Targets/PNaCl.h b/clang/lib/Basic/Targets/PNaCl.h deleted file mode 100644 index d162776b5a0d6..0000000000000 --- a/clang/lib/Basic/Targets/PNaCl.h +++ /dev/null @@ -1,90 +0,0 @@ -//===--- PNaCl.h - Declare PNaCl target feature support ---------*- 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 declares PNaCl TargetInfo objects. -// -//===----------------------------------------------------------------------===// - -#ifndef LLVM_CLANG_LIB_BASIC_TARGETS_PNACL_H -#define LLVM_CLANG_LIB_BASIC_TARGETS_PNACL_H - -#include "Mips.h" -#include "clang/Basic/TargetInfo.h" -#include "clang/Basic/TargetOptions.h" -#include "llvm/Support/Compiler.h" -#include "llvm/TargetParser/Triple.h" - -namespace clang { -namespace targets { - -class LLVM_LIBRARY_VISIBILITY PNaClTargetInfo : public TargetInfo { -public: - PNaClTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts) - : TargetInfo(Triple) { - this->LongAlign = 32; - this->LongWidth = 32; - this->PointerAlign = 32; - this->PointerWidth = 32; - this->IntMaxType = TargetInfo::SignedLongLong; - this->Int64Type = TargetInfo::SignedLongLong; - this->DoubleAlign = 64; - this->LongDoubleWidth = 64; - this->LongDoubleAlign = 64; - this->SizeType = TargetInfo::UnsignedInt; - this->PtrDiffType = TargetInfo::SignedInt; - this->IntPtrType = TargetInfo::SignedInt; - this->RegParmMax = 0; // Disallow regparm - } - - void getArchDefines(const LangOptions &Opts, MacroBuilder &Builder) const; - - void getTargetDefines(const LangOptions &Opts, - MacroBuilder &Builder) const override { - getArchDefines(Opts, Builder); - } - - bool hasFeature(StringRef Feature) const override { - return Feature == "pnacl"; - } - - llvm::SmallVector<Builtin::InfosShard> getTargetBuiltins() const override { - return {}; - } - - BuiltinVaListKind getBuiltinVaListKind() const override { - return TargetInfo::PNaClABIBuiltinVaList; - } - - ArrayRef<const char *> getGCCRegNames() const override; - - ArrayRef<TargetInfo::GCCRegAlias> getGCCRegAliases() const override; - - bool validateAsmConstraint(const char *&Name, - TargetInfo::ConstraintInfo &Info) const override { - return false; - } - - std::string_view getClobbers() const override { return ""; } - - bool hasBitIntType() const override { return true; } -}; - -// We attempt to use PNaCl (le32) frontend and Mips32EL backend. -class LLVM_LIBRARY_VISIBILITY NaClMips32TargetInfo : public MipsTargetInfo { -public: - NaClMips32TargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts) - : MipsTargetInfo(Triple, Opts) {} - - BuiltinVaListKind getBuiltinVaListKind() const override { - return TargetInfo::PNaClABIBuiltinVaList; - } -}; -} // namespace targets -} // namespace clang - -#endif // LLVM_CLANG_LIB_BASIC_TARGETS_PNACL_H diff --git a/clang/lib/CodeGen/CMakeLists.txt b/clang/lib/CodeGen/CMakeLists.txt index ebe2fbd7db295..51769fe895ee3 100644 --- a/clang/lib/CodeGen/CMakeLists.txt +++ b/clang/lib/CodeGen/CMakeLists.txt @@ -142,7 +142,6 @@ add_clang_library(clangCodeGen Targets/MSP430.cpp Targets/Mips.cpp Targets/NVPTX.cpp - Targets/PNaCl.cpp Targets/PPC.cpp Targets/RISCV.cpp Targets/SPIR.cpp diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 5dbd50be6ca1a..2041c5fd0f68a 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -118,9 +118,7 @@ createTargetCodeGenInfo(CodeGenModule &CGM) { return createM68kTargetCodeGenInfo(CGM); case llvm::Triple::mips: case llvm::Triple::mipsel: - if (Triple.getOS() == llvm::Triple::NaCl) - return createPNaClTargetCodeGenInfo(CGM); - else if (Triple.getOS() == llvm::Triple::Win32) + if (Triple.getOS() == llvm::Triple::Win32) return createWindowsMIPSTargetCodeGenInfo(CGM, /*IsOS32=*/true); return createMIPSTargetCodeGenInfo(CGM, /*IsOS32=*/true); diff --git a/clang/lib/CodeGen/TargetInfo.h b/clang/lib/CodeGen/TargetInfo.h index 5df19fbef1e5b..44dab29b3ea86 100644 --- a/clang/lib/CodeGen/TargetInfo.h +++ b/clang/lib/CodeGen/TargetInfo.h @@ -533,9 +533,6 @@ createMSP430TargetCodeGenInfo(CodeGenModule &CGM); std::unique_ptr<TargetCodeGenInfo> createNVPTXTargetCodeGenInfo(CodeGenModule &CGM); -std::unique_ptr<TargetCodeGenInfo> -createPNaClTargetCodeGenInfo(CodeGenModule &CGM); - enum class PPC64_SVR4_ABIKind { ELFv1 = 0, ELFv2, diff --git a/clang/lib/CodeGen/Targets/PNaCl.cpp b/clang/lib/CodeGen/Targets/PNaCl.cpp deleted file mode 100644 index 358010785850e..0000000000000 --- a/clang/lib/CodeGen/Targets/PNaCl.cpp +++ /dev/null @@ -1,114 +0,0 @@ -//===- PNaCl.cpp ----------------------------------------------------------===// -// -// 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 -// -//===----------------------------------------------------------------------===// - -#include "ABIInfoImpl.h" -#include "TargetInfo.h" - -using namespace clang; -using namespace clang::CodeGen; - -//===----------------------------------------------------------------------===// -// le32/PNaCl bitcode ABI Implementation -// -// This is a simplified version of the x86_32 ABI. Arguments and return values -// are always passed on the stack. -//===----------------------------------------------------------------------===// - -class PNaClABIInfo : public ABIInfo { - public: - PNaClABIInfo(CodeGen::CodeGenTypes &CGT) : ABIInfo(CGT) {} - - ABIArgInfo classifyReturnType(QualType RetTy) const; - ABIArgInfo classifyArgumentType(QualType RetTy) const; - - void computeInfo(CGFunctionInfo &FI) const override; - RValue EmitVAArg(CodeGenFunction &CGF, Address VAListAddr, QualType Ty, - AggValueSlot Slot) const override; -}; - -class PNaClTargetCodeGenInfo : public TargetCodeGenInfo { - public: - PNaClTargetCodeGenInfo(CodeGen::CodeGenTypes &CGT) - : TargetCodeGenInfo(std::make_unique<PNaClABIInfo>(CGT)) {} -}; - -void PNaClABIInfo::computeInfo(CGFunctionInfo &FI) const { - if (!getCXXABI().classifyReturnType(FI)) - FI.getReturnInfo() = classifyReturnType(FI.getReturnType()); - - for (auto &I : FI.arguments()) - I.info = classifyArgumentType(I.type); -} - -RValue PNaClABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr, - QualType Ty, AggValueSlot Slot) const { - // The PNaCL ABI is a bit odd, in that varargs don't use normal - // function classification. Structs get passed directly for varargs - // functions, through a rewriting transform in - // pnacl-llvm/lib/Transforms/NaCl/ExpandVarArgs.cpp, which allows - // this target to actually support a va_arg instructions with an - // aggregate type, unlike other targets. - return CGF.EmitLoadOfAnyValue( - CGF.MakeAddrLValue( - EmitVAArgInstr(CGF, VAListAddr, Ty, ABIArgInfo::getDirect()), Ty), - Slot); -} - -/// Classify argument of given type \p Ty. -ABIArgInfo PNaClABIInfo::classifyArgumentType(QualType Ty) const { - if (isAggregateTypeForABI(Ty)) { - if (CGCXXABI::RecordArgABI RAA = getRecordArgABI(Ty, getCXXABI())) - return getNaturalAlignIndirect(Ty, getDataLayout().getAllocaAddrSpace(), - RAA == CGCXXABI::RAA_DirectInMemory); - return getNaturalAlignIndirect(Ty, getDataLayout().getAllocaAddrSpace()); - } else if (const EnumType *EnumTy = Ty->getAs<EnumType>()) { - // Treat an enum type as its underlying type. - Ty = EnumTy->getDecl()->getIntegerType(); - } else if (Ty->isFloatingType()) { - // Floating-point types don't go inreg. - return ABIArgInfo::getDirect(); - } else if (const auto *EIT = Ty->getAs<BitIntType>()) { - // Treat bit-precise integers as integers if <= 64, otherwise pass - // indirectly. - if (EIT->getNumBits() > 64) - return getNaturalAlignIndirect(Ty, getDataLayout().getAllocaAddrSpace()); - return ABIArgInfo::getDirect(); - } - - return (isPromotableIntegerTypeForABI(Ty) ? ABIArgInfo::getExtend(Ty) - : ABIArgInfo::getDirect()); -} - -ABIArgInfo PNaClABIInfo::classifyReturnType(QualType RetTy) const { - if (RetTy->isVoidType()) - return ABIArgInfo::getIgnore(); - - // In the PNaCl ABI we always return records/structures on the stack. - if (isAggregateTypeForABI(RetTy)) - return getNaturalAlignIndirect(RetTy, getDataLayout().getAllocaAddrSpace()); - - // Treat bit-precise integers as integers if <= 64, otherwise pass indirectly. - if (const auto *EIT = RetTy->getAs<BitIntType>()) { - if (EIT->getNumBits() > 64) - return getNaturalAlignIndirect(RetTy, - getDataLayout().getAllocaAddrSpace()); - return ABIArgInfo::getDirect(); - } - - // Treat an enum type as its underlying type. - if (const EnumType *EnumTy = RetTy->getAs<EnumType>()) - RetTy = EnumTy->getDecl()->getIntegerType(); - - return (isPromotableIntegerTypeForABI(RetTy) ? ABIArgInfo::getExtend(RetTy) - : ABIArgInfo::getDirect()); -} - -std::unique_ptr<TargetCodeGenInfo> -CodeGen::createPNaClTargetCodeGenInfo(CodeGenModule &CGM) { - return std::make_unique<PNaClTargetCodeGenInfo>(CGM.getTypes()); -} diff --git a/clang/lib/CodeGen/Targets/X86.cpp b/clang/lib/CodeGen/Targets/X86.cpp index b36a6e1396653..606e5ce780bd0 100644 --- a/clang/lib/CodeGen/Targets/X86.cpp +++ b/clang/lib/CodeGen/Targets/X86.cpp @@ -2573,8 +2573,7 @@ GetX86_64ByValArgumentPair(llvm::Type *Lo, llvm::Type *Hi, if (HiStart != 8) { // There are usually two sorts of types the ABI generation code can produce // for the low part of a pair that aren't 8 bytes in size: half, float or - // i8/i16/i32. This can also include pointers when they are 32-bit (X32 and - // NaCl). + // i8/i16/i32. This can also include pointers when they are 32-bit (X32). // Promote these to a larger type. if (Lo->isHalfTy() || Lo->isFloatTy()) Lo = llvm::Type::getDoubleTy(Lo->getContext()); diff --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt index 5bdb6614389cf..306d6f689ef0a 100644 --- a/clang/lib/Driver/CMakeLists.txt +++ b/clang/lib/Driver/CMakeLists.txt @@ -69,7 +69,6 @@ add_clang_library(clangDriver ToolChains/MinGW.cpp ToolChains/MSP430.cpp ToolChains/MSVC.cpp - ToolChains/NaCl.cpp ToolChains/NetBSD.cpp ToolChains/OHOS... [truncated] `````````` </details> https://github.com/llvm/llvm-project/pull/133661 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
