Move HasSignedPersonality to AArch64MachineModuleInfo

Author: kovdan01

llvm/include/llvm/CodeGen/MachineModuleInfoImpls.h

@@ -83,14 +83,10 @@ class MachineModuleInfoELF : public MachineModuleInfoImpl {
   /// extern_weak symbols.
   DenseMap<MCSymbol *, const MCExpr *> AuthPtrStubs;
 
-  /// HasSignedPersonality is true if the corresponding IR module has the
-  /// "ptrauth-sign-personality" flag set to 1.
-  bool HasSignedPersonality = false;
-
   virtual void anchor(); // Out of line virtual method.
 
 public:
-  MachineModuleInfoELF(const MachineModuleInfo &);
+  MachineModuleInfoELF(const MachineModuleInfo &) {}
 
   StubValueTy &getGVStubEntry(MCSymbol *Sym) {
     assert(Sym && "Key cannot be null");
@@ -109,8 +105,6 @@ class MachineModuleInfoELF : public MachineModuleInfoImpl {
   ExprStubListTy getAuthGVStubList() {
     return getSortedExprStubs(AuthPtrStubs);
   }
-
-  bool hasSignedPersonality() const { return HasSignedPersonality; }
 };
 
 /// MachineModuleInfoCOFF - This is a MachineModuleInfoImpl implementation

llvm/lib/CodeGen/MachineModuleInfoImpls.cpp

@@ -61,13 +61,3 @@ MachineModuleInfoImpl::ExprStubListTy MachineModuleInfoImpl::getSortedExprStubs(
   ExprStubs.clear();
   return List;
 }
-
-MachineModuleInfoELF::MachineModuleInfoELF(const MachineModuleInfo &MMI) {
-  const Module *M = MMI.getModule();
-  const auto *Flag = mdconst::extract_or_null<ConstantInt>(
-      M->getModuleFlag("ptrauth-sign-personality"));
-  if (Flag && Flag->getZExtValue() == 1)
-    HasSignedPersonality = true;
-  else
-    HasSignedPersonality = false;
-}

llvm/lib/Target/AArch64/AArch64MachineModuleInfo.cpp

@@ -0,0 +1,32 @@
+//===--- AArch64MachineModuleInfo.cpp ---------------------------*- 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
+//
+//===----------------------------------------------------------------------===//
+//
+/// \file
+/// AArch64 Machine Module Info.
+///
+//
+//===----------------------------------------------------------------------===//
+
+#include "AArch64MachineModuleInfo.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/Module.h"
+
+namespace llvm {
+
+AArch64MachineModuleInfo::AArch64MachineModuleInfo(const MachineModuleInfo &MMI)
+    : MachineModuleInfoELF(MMI) {
+  const Module *M = MMI.getModule();
+  const auto *Flag = mdconst::extract_or_null<ConstantInt>(
+      M->getModuleFlag("ptrauth-sign-personality"));
+  if (Flag && Flag->getZExtValue() == 1)
+    HasSignedPersonality = true;
+  else
+    HasSignedPersonality = false;
+}
+
+} // end namespace llvm

llvm/lib/Target/AArch64/AArch64MachineModuleInfo.h

@@ -0,0 +1,35 @@
+//===--- AArch64MachineModuleInfo.h -----------------------------*- 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
+//
+//===----------------------------------------------------------------------===//
+//
+/// \file
+/// AArch64 Machine Module Info.
+///
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_AARCH64_AARCH64MACHINEMODULEINFO_H
+#define LLVM_LIB_TARGET_AARCH64_AARCH64MACHINEMODULEINFO_H
+
+#include "llvm/CodeGen/MachineModuleInfoImpls.h"
+
+namespace llvm {
+
+class AArch64MachineModuleInfo final : public MachineModuleInfoELF {
+  /// HasSignedPersonality is true if the corresponding IR module has the
+  /// "ptrauth-sign-personality" flag set to 1.
+  bool HasSignedPersonality = false;
+
+public:
+  AArch64MachineModuleInfo(const MachineModuleInfo &);
+
+  bool hasSignedPersonality() const { return HasSignedPersonality; }
+};
+
+} // end namespace llvm
+
+#endif // LLVM_LIB_TARGET_AARCH64_AARCH64MACHINEMODULEINFO_H

llvm/lib/Target/AArch64/AArch64TargetObjectFile.cpp

@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "AArch64TargetObjectFile.h"
+#include "AArch64MachineModuleInfo.h"
 #include "AArch64TargetMachine.h"
 #include "MCTargetDesc/AArch64MCExpr.h"
 #include "MCTargetDesc/AArch64TargetStreamer.h"
@@ -32,7 +33,7 @@ void AArch64_ELFTargetObjectFile::Initialize(MCContext &Ctx,
 void AArch64_ELFTargetObjectFile::emitPersonalityValueImpl(
     MCStreamer &Streamer, const DataLayout &DL, const MCSymbol *Sym,
     const MachineModuleInfo *MMI) const {
-  if (!MMI->getObjFileInfo<MachineModuleInfoELF>().hasSignedPersonality()) {
+  if (!MMI->getObjFileInfo<AArch64MachineModuleInfo>().hasSignedPersonality()) {
     TargetLoweringObjectFileELF::emitPersonalityValueImpl(Streamer, DL, Sym,
                                                           MMI);
     return;

llvm/lib/Target/AArch64/CMakeLists.txt

@@ -67,6 +67,7 @@ add_llvm_target(AArch64CodeGen
   AArch64LoadStoreOptimizer.cpp
   AArch64LowerHomogeneousPrologEpilog.cpp
   AArch64MachineFunctionInfo.cpp
+  AArch64MachineModuleInfo.cpp
   AArch64MachineScheduler.cpp
   AArch64MacroFusion.cpp
   AArch64MIPeepholeOpt.cpp

llvm/utils/gn/secondary/llvm/lib/Target/AArch64/BUILD.gn

@@ -135,6 +135,7 @@ static_library("LLVMAArch64CodeGen") {
     "AArch64MCInstLower.cpp",
     "AArch64MIPeepholeOpt.cpp",
     "AArch64MachineFunctionInfo.cpp",
+    "AArch64MachineModuleInfo.cpp",
     "AArch64MachineScheduler.cpp",
     "AArch64MacroFusion.cpp",
     "AArch64PBQPRegAlloc.cpp",