github-actions[bot] wrote: <!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code. :warning: <details> <summary> You can test this locally with the following command: </summary> ``````````bash git-clang-format --diff dd7963239e94bcd46e56ae90b08d2d0c9904ff00 0616e7c04d64e2be323bb39904d41a35c3992537 -- clang/test/CodeGen/arm-interrupt-save-fp-attr-status-regs.c clang/test/CodeGen/arm-interrupt-save-fp-attr.c clang/test/Sema/arm-interrupt-save-fp-attr.c clang/lib/CodeGen/Targets/ARM.cpp clang/lib/Sema/SemaDeclAttr.cpp clang/lib/Sema/SemaExpr.cpp clang/test/Sema/arm-interrupt-attr.c llvm/lib/Target/ARM/ARMAsmPrinter.cpp llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp llvm/lib/Target/ARM/ARMFrameLowering.cpp llvm/lib/Target/ARM/ARMFrameLowering.h llvm/lib/Target/ARM/ARMMachineFunctionInfo.h llvm/lib/Target/ARM/Thumb1FrameLowering.cpp `````````` </details> <details> <summary> View the diff from clang-format here. </summary> ``````````diff diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp index 086f0c8daa..931c98a790 100644 --- a/clang/lib/Sema/SemaDeclAttr.cpp +++ b/clang/lib/Sema/SemaDeclAttr.cpp @@ -7524,7 +7524,8 @@ static void handleARMInterruptAttr(Sema &S, Decl *D, const ParsedAttr &AL) { D->addAttr(::new (S.Context) ARMInterruptAttr(S.Context, AL, Kind)); } -static void handleARMInterruptSaveFPAttr(Sema &S, Decl *D, const ParsedAttr &AL) { +static void handleARMInterruptSaveFPAttr(Sema &S, Decl *D, + const ParsedAttr &AL) { handleARMInterruptAttr(S, D, AL); bool VFP = S.Context.getTargetInfo().hasFeature("vfp"); @@ -9158,7 +9159,7 @@ ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D, const ParsedAttr &AL, : AL.isDeclspecAttribute() ? (unsigned)diag::warn_unhandled_ms_attribute_ignored : (unsigned)diag::warn_unknown_attribute_ignored) - << AL << AL.getRange(); + << AL << AL.getRange(); return; } diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 72be89dbc5..98a2e356d6 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -6931,7 +6931,7 @@ ExprResult Sema::BuildResolvedCallExpr(Expr *Fn, NamedDecl *NDecl, // no_caller_saved_registers since there is no efficient way to // save and restore the non-GPR state. if (auto *Caller = getCurFunctionDecl()) { - if (Caller->hasAttr<ARMInterruptAttr>() && + if (Caller->hasAttr<ARMInterruptAttr>() && !Caller->hasAttr<ARMSaveFPAttr>()) { bool VFP = Context.getTargetInfo().hasFeature("vfp"); if (VFP && (!FDecl || !FDecl->hasAttr<ARMInterruptAttr>())) { diff --git a/llvm/lib/Target/ARM/ARMFrameLowering.cpp b/llvm/lib/Target/ARM/ARMFrameLowering.cpp index 027fce04e2..12e7050a43 100644 --- a/llvm/lib/Target/ARM/ARMFrameLowering.cpp +++ b/llvm/lib/Target/ARM/ARMFrameLowering.cpp @@ -757,8 +757,8 @@ void ARMFrameLowering::emitPrologue(MachineFunction &MF, // Determine the sizes of each callee-save spill areas and record which frame // belongs to which callee-save spill areas. - unsigned GPRCS1Size = 0, GPRCS2Size = 0, FPStatusSize = 0, - DPRCS1Size = 0, GPRCS3Size = 0, DPRCS2Size = 0; + unsigned GPRCS1Size = 0, GPRCS2Size = 0, FPStatusSize = 0, DPRCS1Size = 0, + GPRCS3Size = 0, DPRCS2Size = 0; int FramePtrSpillFI = 0; int D8SpillFI = 0; @@ -848,8 +848,8 @@ void ARMFrameLowering::emitPrologue(MachineFunction &MF, } } - MachineBasicBlock::iterator - LastPush = MBB.end(), GPRCS1Push, GPRCS2Push, GPRCS3Push; + MachineBasicBlock::iterator LastPush = MBB.end(), GPRCS1Push, GPRCS2Push, + GPRCS3Push; // Move past the PAC computation. if (AFI->shouldSignReturnAddress()) @@ -1325,14 +1325,11 @@ void ARMFrameLowering::emitEpilogue(MachineFunction &MF, } // Move SP to start of FP callee save spill area. - NumBytes -= (ReservedArgStack + - AFI->getFPCXTSaveAreaSize() + - AFI->getGPRCalleeSavedArea1Size() + - AFI->getGPRCalleeSavedArea2Size() + - AFI->getFPStatusSavesSize() + - AFI->getDPRCalleeSavedGapSize() + - AFI->getDPRCalleeSavedArea1Size() + - AFI->getGPRCalleeSavedArea3Size()); + NumBytes -= + (ReservedArgStack + AFI->getFPCXTSaveAreaSize() + + AFI->getGPRCalleeSavedArea1Size() + AFI->getGPRCalleeSavedArea2Size() + + AFI->getFPStatusSavesSize() + AFI->getDPRCalleeSavedGapSize() + + AFI->getDPRCalleeSavedArea1Size() + AFI->getGPRCalleeSavedArea3Size()); // Reset SP based on frame pointer only if the stack frame extends beyond // frame pointer stack slot or target is ELF and the function has FP. @@ -1717,9 +1714,8 @@ void ARMFrameLowering::emitFPStatusSaves(MachineBasicBlock &MBB, SmallVector<Register> Regs; auto RegPresent = [&CSI](Register Reg) { - return llvm::any_of(CSI, [Reg](const CalleeSavedInfo &C) { - return C.getReg() == Reg; - }); + return llvm::any_of( + CSI, [Reg](const CalleeSavedInfo &C) { return C.getReg() == Reg; }); }; // If we need to save FPSCR, then we must move FPSCR into R4 with the VMRS @@ -1766,9 +1762,8 @@ void ARMFrameLowering::emitFPStatusRestores( SmallVector<Register> Regs; auto RegPresent = [&CSI](Register Reg) { - return llvm::any_of(CSI, [Reg](const CalleeSavedInfo &C) { - return C.getReg() == Reg; - }); + return llvm::any_of( + CSI, [Reg](const CalleeSavedInfo &C) { return C.getReg() == Reg; }); }; // Do nothing if we don't need to restore any FP status registers. diff --git a/llvm/lib/Target/ARM/ARMMachineFunctionInfo.h b/llvm/lib/Target/ARM/ARMMachineFunctionInfo.h index 25a78d6c53..3081bc30f3 100644 --- a/llvm/lib/Target/ARM/ARMMachineFunctionInfo.h +++ b/llvm/lib/Target/ARM/ARMMachineFunctionInfo.h @@ -206,7 +206,7 @@ public: unsigned getFrameRecordSavedAreaSize() const { return FRSaveSize; } unsigned getGPRCalleeSavedArea1Size() const { return GPRCS1Size; } unsigned getGPRCalleeSavedArea2Size() const { return GPRCS2Size; } - unsigned getFPStatusSavesSize() const { return FPStatusSize; } + unsigned getFPStatusSavesSize() const { return FPStatusSize; } unsigned getDPRCalleeSavedGapSize() const { return DPRCSAlignGapSize; } unsigned getDPRCalleeSavedArea1Size() const { return DPRCS1Size; } unsigned getGPRCalleeSavedArea3Size() const { return GPRCS3Size; } @@ -215,7 +215,7 @@ public: void setFrameRecordSavedAreaSize(unsigned s) { FRSaveSize = s; } void setGPRCalleeSavedArea1Size(unsigned s) { GPRCS1Size = s; } void setGPRCalleeSavedArea2Size(unsigned s) { GPRCS2Size = s; } - void setFPStatusSavesSize(unsigned s) { FPStatusSize = s; } + void setFPStatusSavesSize(unsigned s) { FPStatusSize = s; } void setDPRCalleeSavedGapSize(unsigned s) { DPRCSAlignGapSize = s; } void setDPRCalleeSavedArea1Size(unsigned s) { DPRCS1Size = s; } void setGPRCalleeSavedArea3Size(unsigned s) { GPRCS3Size = s; } diff --git a/llvm/lib/Target/ARM/Thumb1FrameLowering.cpp b/llvm/lib/Target/ARM/Thumb1FrameLowering.cpp index f68d2698d2..03ce22df4d 100644 --- a/llvm/lib/Target/ARM/Thumb1FrameLowering.cpp +++ b/llvm/lib/Target/ARM/Thumb1FrameLowering.cpp @@ -531,11 +531,10 @@ void Thumb1FrameLowering::emitEpilogue(MachineFunction &MF, } // Move SP to start of FP callee save spill area. - NumBytes -= (AFI->getFrameRecordSavedAreaSize() + - AFI->getGPRCalleeSavedArea1Size() + - AFI->getGPRCalleeSavedArea2Size() + - AFI->getDPRCalleeSavedArea1Size() + - ArgRegsSaveSize); + NumBytes -= + (AFI->getFrameRecordSavedAreaSize() + + AFI->getGPRCalleeSavedArea1Size() + AFI->getGPRCalleeSavedArea2Size() + + AFI->getDPRCalleeSavedArea1Size() + ArgRegsSaveSize); // We are likely to need a scratch register and we know all callee-save // registers are free at this point in the epilogue, so pick one. `````````` </details> https://github.com/llvm/llvm-project/pull/89654 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits