diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.h b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.h index d298af92ba5e6..920a5eba20abd 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.h +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.h @@ -77,7 +77,7 @@ class ClassDescriptorV2 : public ObjCLanguageRuntime::ClassDescriptor { void GetIVarInformation(); private: - static const uint32_t RW_REALIZED = (1 << 31); + static const uint32_t RW_REALIZED = (1u << 31); struct objc_class_t { ObjCLanguageRuntime::ObjCISA m_isa = 0; // The class's metaclass. @@ -173,7 +173,8 @@ class ClassDescriptorV2 : public ObjCLanguageRuntime::ClassDescriptor { } bool Read(Process *process, lldb::addr_t addr, - lldb::addr_t relative_method_lists_base_addr, bool, bool); + lldb::addr_t relative_selector_base_addr, bool is_small, + bool has_direct_sel); }; struct ivar_list_t { diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp index d5357b94d68ed..a50cdc88cd012 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp @@ -1399,7 +1399,7 @@ class RemoteNXMapTable { return *this; } - const element operator*() const { + element operator*() const { if (m_index == -1) { // TODO find a way to make this an error, but not an assert return element(); @@ -2739,7 +2739,7 @@ lldb::addr_t AppleObjCRuntimeV2::LookupRuntimeSymbol(ConstString name) { std::pair class_and_ivar = ivar_skipped_prefix.split('.'); - if (class_and_ivar.first.size() && class_and_ivar.second.size()) { + if (!class_and_ivar.first.empty() && !class_and_ivar.second.empty()) { const ConstString class_name_cs(class_and_ivar.first); ClassDescriptorSP descriptor = ObjCLanguageRuntime::GetClassDescriptorFromClassName(class_name_cs); diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h index 678865ecd9186..c9d0b3a907b54 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h @@ -65,12 +65,12 @@ class AppleObjCRuntimeV2 : public AppleObjCRuntime { return ObjCRuntimeVersions::eAppleObjC_V2; } - size_t GetByteOffsetForIvar(CompilerType &parent_qual_type, + size_t GetByteOffsetForIvar(CompilerType &parent_ast_type, const char *ivar_name) override; void UpdateISAToDescriptorMapIfNeeded() override; - ClassDescriptorSP GetClassDescriptor(ValueObject &in_value) override; + ClassDescriptorSP GetClassDescriptor(ValueObject &valobj) override; ClassDescriptorSP GetClassDescriptorFromISA(ObjCISA isa) override; diff --git a/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp b/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp index 8f9d9173af9fb..d81b634be87b1 100644 --- a/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp +++ b/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp @@ -2867,7 +2867,7 @@ bool IRTranslator::translateVAArg(const User &U, MachineIRBuilder &MIRBuilder) { } bool IRTranslator::translateUnreachable(const User &U, MachineIRBuilder &MIRBuilder) { - if (!MF->getTarget().Options.TrapUnreachable) + if (!MF->getTarget().Options.TrapUnreachable) return true; auto &UI = cast(U); diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 87ba56137728b..7191e89d36071 100644 --- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -561,7 +561,7 @@ namespace { SDValue N1, SDNodeFlags Flags); SDValue reassociateOps(unsigned Opc, const SDLoc &DL, SDValue N0, SDValue N1, SDNodeFlags Flags); - SDValue reassociateReduction(unsigned ResOpc, unsigned Opc, const SDLoc &DL, + SDValue reassociateReduction(unsigned RedOpc, unsigned Opc, const SDLoc &DL, EVT VT, SDValue N0, SDValue N1, SDNodeFlags Flags = SDNodeFlags()); @@ -6459,7 +6459,7 @@ bool DAGCombiner::BackwardsPropagateMask(SDNode *N) { SmallPtrSet NodesWithConsts; SDNode *FixupNode = nullptr; if (SearchForAndLoads(N, Loads, NodesWithConsts, Mask, FixupNode)) { - if (Loads.size() == 0) + if (Loads.empty()) return false; LLVM_DEBUG(dbgs() << "Backwards propagate AND: "; N->dump()); @@ -7462,12 +7462,12 @@ SDValue DAGCombiner::MatchBSwapHWord(SDNode *N, SDValue N0, SDValue N1) { if (SDValue BSwap = matchBSwapHWordOrAndAnd(TLI, DAG, N, N0, N1, VT, getShiftAmountTy(VT))) - return BSwap; + return BSwap; // Try again with commuted operands. if (SDValue BSwap = matchBSwapHWordOrAndAnd(TLI, DAG, N, N1, N0, VT, getShiftAmountTy(VT))) - return BSwap; + return BSwap; // Look for either @@ -8488,7 +8488,7 @@ SDValue DAGCombiner::MatchRotate(SDValue LHS, SDValue RHS, const SDLoc &DL) { /// *ExtractVectorElement using SDByteProvider = ByteProvider; -static const std::optional +static std::optional calculateByteProvider(SDValue Op, unsigned Index, unsigned Depth, std::optional VectorIndex, unsigned StartingIndex = 0) { @@ -12505,7 +12505,7 @@ static bool ExtendUsesToFormExtLoad(EVT VT, SDNode *N, SDValue N0, if (BothLiveOut) // Both unextended and extended values are live out. There had better be // a good reason for the transformation. - return ExtendNodes.size(); + return !ExtendNodes.empty(); } return true; } @@ -19303,7 +19303,7 @@ SDValue DAGCombiner::getMergeStoreChains(SmallVectorImpl &StoreNodes, Chains.push_back(StoreNodes[i].MemNode->getChain()); } - assert(Chains.size() > 0 && "Chain should have generated a chain"); + assert(!Chains.empty() && "Chain should have generated a chain"); return DAG.getTokenFactor(StoreDL, Chains); } @@ -27408,7 +27408,7 @@ SDValue DAGCombiner::FindBetterChain(SDNode *N, SDValue OldChain) { GatherAllAliases(N, OldChain, Aliases); // If no operands then chain to entry token. - if (Aliases.size() == 0) + if (Aliases.empty()) return DAG.getEntryNode(); // If a single operand then chain to it. We don't need to revisit it. @@ -27504,7 +27504,7 @@ bool DAGCombiner::parallelizeChainedStores(StoreSDNode *St) { } // If we didn't find a chained store, exit. - if (ChainedStores.size() == 0) + if (ChainedStores.empty()) return false; // Improve all chained stores (St and ChainedStores members) starting from