clang z80 fixes

Author: adriweb

clang/lib/Basic/Targets/Z80.cpp

@@ -20,19 +20,23 @@ namespace targets {
 
 const Builtin::Info BuiltinInfoZ80[] = {
 #define BUILTIN(ID, TYPE, ATTRS)                                               \
-  {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, nullptr},
+  {#ID, TYPE, ATTRS, nullptr, HeaderDesc::NO_HEADER, ALL_LANGUAGES},
+#define LANGBUILTIN(ID, TYPE, ATTRS, LANG)                                     \
+  {#ID, TYPE, ATTRS, nullptr, HeaderDesc::NO_HEADER, LANG},
 #define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE)                               \
-  {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, FEATURE},
+  {#ID, TYPE, ATTRS, FEATURE, HeaderDesc::NO_HEADER, ALL_LANGUAGES},
 #define TARGET_HEADER_BUILTIN(ID, TYPE, ATTRS, HEADER, LANGS, FEATURE)         \
-  {#ID, TYPE, ATTRS, HEADER, LANGS, FEATURE},
+  {#ID, TYPE, ATTRS, FEATURE, HeaderDesc::HEADER, LANGS},
 #include "clang/Basic/BuiltinsZ80.def"
 
 #define BUILTIN(ID, TYPE, ATTRS)                                               \
-  {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, nullptr},
+  {#ID, TYPE, ATTRS, nullptr, HeaderDesc::NO_HEADER, ALL_LANGUAGES},
+#define LANGBUILTIN(ID, TYPE, ATTRS, LANG)                                     \
+  {#ID, TYPE, ATTRS, nullptr, HeaderDesc::NO_HEADER, LANG},
 #define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE)                               \
-  {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, FEATURE},
+  {#ID, TYPE, ATTRS, FEATURE, HeaderDesc::NO_HEADER, ALL_LANGUAGES},
 #define TARGET_HEADER_BUILTIN(ID, TYPE, ATTRS, HEADER, LANGS, FEATURE)         \
-  {#ID, TYPE, ATTRS, HEADER, LANGS, FEATURE},
+  {#ID, TYPE, ATTRS, FEATURE, HeaderDesc::HEADER, LANGS},
 #include "clang/Basic/BuiltinsEZ80.def"
 };
 
@@ -203,7 +207,7 @@ Z80TargetInfoBase::convertConstraint(const char *&Constraint) const {
 }
 
 ArrayRef<TargetInfo::AddlRegName> Z80TargetInfoBase::getGCCAddlRegNames() const {
-  return llvm::makeArrayRef(AddlRegNames);
+  return ArrayRef(AddlRegNames);
 }
 
 bool Z80TargetInfo::setCPU(const std::string &Name) {
@@ -245,7 +249,7 @@ ArrayRef<Builtin::Info> Z80TargetInfo::getTargetBuiltins() const {
 }
 
 ArrayRef<const char *> Z80TargetInfo::getGCCRegNames() const {
-  return llvm::makeArrayRef(Z80GCCRegNames);
+  return ArrayRef(Z80GCCRegNames);
 }
 
 bool EZ80TargetInfo::setCPU(const std::string &Name) {
@@ -268,5 +272,5 @@ ArrayRef<Builtin::Info> EZ80TargetInfo::getTargetBuiltins() const {
 }
 
 ArrayRef<const char *> EZ80TargetInfo::getGCCRegNames() const {
-  return llvm::makeArrayRef(EZ80GCCRegNames);
+  return ArrayRef(EZ80GCCRegNames);
 }

clang/lib/Basic/Targets/Z80.h

@@ -53,7 +53,7 @@ class LLVM_LIBRARY_VISIBILITY Z80TargetInfoBase : public TargetInfo {
 
   const char *getClobbers() const override { return ""; }
   ArrayRef<TargetInfo::GCCRegAlias> getGCCRegAliases() const override {
-    return None;
+    return std::nullopt;
   }
   ArrayRef<TargetInfo::AddlRegName> getGCCAddlRegNames() const override;
 

clang/lib/CodeGen/CodeGenFunction.h

@@ -4264,9 +4264,8 @@ class CodeGenFunction : public CodeGenTypeCache {
   llvm::Value *EmitRISCVBuiltinExpr(unsigned BuiltinID, const CallExpr *E,
                                     ReturnValueSlot ReturnValue);
   llvm::Value *EmitLoongArchBuiltinExpr(unsigned BuiltinID, const CallExpr *E);
-  void ProcessOrderScopeAMDGCN(llvm::Value *Order, llvm::Value *Scope,
   llvm::Value *EmitZ80BuiltinExpr(unsigned BuiltinID, const CallExpr *E);
-  bool ProcessOrderScopeAMDGCN(llvm::Value *Order, llvm::Value *Scope,
+  void ProcessOrderScopeAMDGCN(llvm::Value *Order, llvm::Value *Scope,
                                llvm::AtomicOrdering &AO,
                                llvm::SyncScope::ID &SSID);
 

clang/lib/CodeGen/CodeGenModule.cpp

@@ -129,7 +129,7 @@ CodeGenModule::CodeGenModule(ASTContext &C,
       C.toCharUnitsFromBits(C.getTargetInfo().getPointerAlign(LangAS::Default))
           .getQuantity();
   PointerSizeInBytes =
-    C.toCharUnitsFromBits(C.getTargetInfo().getPointerWidth(0)).getQuantity();
+    C.toCharUnitsFromBits(C.getTargetInfo().getPointerWidth(LangAS::Default)).getQuantity();
   SizeSizeInBytes =
     C.toCharUnitsFromBits(C.getTargetInfo().getMaxPointerWidth()).getQuantity();
   SizeAlignInBytes =

clang/lib/CodeGen/TargetInfo.cpp

@@ -5480,7 +5480,7 @@ Address PPC64_SVR4_ABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
   // types this way, and so right-alignment only applies to fundamental types.
   // So on PPC64, we must force the use of right-alignment even for aggregates.
   return emitVoidPtrVAArg(CGF, VAListAddr, Ty, /*Indirect*/ false, TypeInfo,
-                          SlotSize, /*AllowHigher*/ true,
+                          SlotSize, SlotSize, /*AllowHigher*/ true,
                           /*ForceRightAdjust*/ true);
 }