Index: clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h =================================================================== --- clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h +++ clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h @@ -630,7 +630,7 @@ if (Msg.empty()) return None; - return std::move(Msg); + return Msg; } StringRef getTagDescription() const override { Index: clang/lib/AST/ASTImporter.cpp =================================================================== --- clang/lib/AST/ASTImporter.cpp +++ clang/lib/AST/ASTImporter.cpp @@ -685,13 +685,13 @@ auto *FTSInfo = FromFD->getTemplateSpecializationInfo(); if (Error Err = importInto(std::get<0>(Result), FTSInfo->getTemplate())) - return std::move(Err); + return Err; // Import template arguments. auto TemplArgs = FTSInfo->TemplateArguments->asArray(); if (Error Err = ImportTemplateArguments(TemplArgs.data(), TemplArgs.size(), std::get<1>(Result))) - return std::move(Err); + return Err; return Result; } @@ -701,7 +701,7 @@ ASTNodeImporter::import(TemplateParameterList *From) { SmallVector To(From->size()); if (Error Err = ImportContainerChecked(*From, To)) - return std::move(Err); + return Err; ExpectedExpr ToRequiresClause = import(From->getRequiresClause()); if (!ToRequiresClause) @@ -793,7 +793,7 @@ ToPack.reserve(From.pack_size()); if (Error Err = ImportTemplateArguments( From.pack_begin(), From.pack_size(), ToPack)) - return std::move(Err); + return Err; return TemplateArgument( llvm::makeArrayRef(ToPack).copy(Importer.getToContext())); @@ -920,7 +920,7 @@ SourceLocation EllipsisLoc; if (From.isPackExpansion()) if (Error Err = importInto(EllipsisLoc, From.getEllipsisLoc())) - return std::move(Err); + return Err; return LambdaCapture( *LocationOrErr, From.isImplicit(), From.getCaptureKind(), Var, @@ -1373,7 +1373,7 @@ SmallVector ToTemplateArgs; if (Error Err = ImportTemplateArguments( T->getArgs(), T->getNumArgs(), ToTemplateArgs)) - return std::move(Err); + return Err; QualType ToCanonType; if (!QualType(T, 0).isCanonical()) { @@ -1431,7 +1431,7 @@ ToPack.reserve(T->getNumArgs()); if (Error Err = ImportTemplateArguments( T->getArgs(), T->getNumArgs(), ToPack)) - return std::move(Err); + return Err; return Importer.getToContext().getDependentTemplateSpecializationType( T->getKeyword(), *ToQualifierOrErr, ToName, ToPack); @@ -2124,7 +2124,7 @@ // Import the context of this declaration. DeclContext *DC, *LexicalDC; if (Error Err = ImportDeclContext(D, DC, LexicalDC)) - return std::move(Err); + return Err; // Import the location of this declaration. ExpectedSLoc LocOrErr = import(D->getLocation()); @@ -2210,7 +2210,7 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -2275,7 +2275,7 @@ Importer.MapImported(D, ToNamespace); if (Error Err = ImportDeclContext(D)) - return std::move(Err); + return Err; return ToNamespace; } @@ -2287,7 +2287,7 @@ SourceLocation Loc; NamedDecl *LookupD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, LookupD, Loc)) - return std::move(Err); + return Err; if (LookupD) return LookupD; @@ -2326,7 +2326,7 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -2415,7 +2415,7 @@ SourceLocation Loc; NamedDecl *FoundD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, FoundD, Loc)) - return std::move(Err); + return Err; if (FoundD) return FoundD; @@ -2470,7 +2470,7 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -2509,7 +2509,7 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -2519,7 +2519,7 @@ if (!SearchName && D->getTypedefNameForAnonDecl()) { if (Error Err = importInto( SearchName, D->getTypedefNameForAnonDecl()->getDeclName())) - return std::move(Err); + return Err; IDNS = Decl::IDNS_Ordinary; } else if (Importer.getToContext().getLangOpts().CPlusPlus) IDNS |= Decl::IDNS_Ordinary; @@ -2583,7 +2583,7 @@ // Import the definition if (D->isCompleteDefinition()) if (Error Err = ImportDefinition(D, D2)) - return std::move(Err); + return Err; return D2; } @@ -2603,7 +2603,7 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -2613,7 +2613,7 @@ if (!SearchName && D->getTypedefNameForAnonDecl()) { if (Error Err = importInto( SearchName, D->getTypedefNameForAnonDecl()->getDeclName())) - return std::move(Err); + return Err; IDNS = Decl::IDNS_Ordinary; } else if (Importer.getToContext().getLangOpts().CPlusPlus) IDNS |= Decl::IDNS_Ordinary | Decl::IDNS_TagFriend; @@ -2672,7 +2672,7 @@ // FoundDef may not have every implicit method that D has // because implicit methods are created only if they are used. if (Error Err = ImportImplicitMethods(DCXX, FoundCXX)) - return std::move(Err); + return Err; } } PrevDecl = FoundRecord->getMostRecentDecl(); @@ -2745,7 +2745,7 @@ DCXX->getDescribedClassTemplate()) { ClassTemplateDecl *ToDescribed; if (Error Err = importInto(ToDescribed, FromDescribed)) - return std::move(Err); + return Err; D2CXX->setDescribedClassTemplate(ToDescribed); if (!DCXX->isInjectedClassName() && !IsFriendTemplate) { // In a record describing a template the type should be an @@ -2818,7 +2818,7 @@ if (D->isCompleteDefinition()) if (Error Err = ImportDefinition(D, D2, IDK_Default)) - return std::move(Err); + return Err; return D2; } @@ -2830,7 +2830,7 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -3040,7 +3040,7 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -3131,7 +3131,7 @@ DeclarationNameInfo NameInfo(Name, Loc); // Import additional name location/type info. if (Error Err = ImportDeclarationNameLoc(D->getNameInfo(), NameInfo)) - return std::move(Err); + return Err; QualType FromTy = D->getType(); bool usedDifferentExceptionSpec = false; @@ -3262,7 +3262,7 @@ // Import first, then allocate memory and copy if there was no error. if (Error Err = ImportContainerChecked( FromConstructor->inits(), CtorInitializers)) - return std::move(Err); + return Err; auto **Memory = new (Importer.getToContext()) CXXCtorInitializer *[NumInitializers]; std::copy(CtorInitializers.begin(), CtorInitializers.end(), Memory); @@ -3316,14 +3316,14 @@ Error Err = ImportFunctionDeclBody(D, ToFunction); if (Err) - return std::move(Err); + return Err; } // FIXME: Other bits to merge? // If it is a template, import all related things. if (Error Err = ImportTemplateInformation(D, ToFunction)) - return std::move(Err); + return Err; bool IsFriend = D->isInIdentifierNamespace(Decl::IDNS_OrdinaryFriend); @@ -3379,7 +3379,7 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -3464,7 +3464,7 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -3531,7 +3531,7 @@ // Import the major distinguishing characteristics of a declaration. DeclContext *DC, *LexicalDC; if (Error Err = ImportDeclContext(D, DC, LexicalDC)) - return std::move(Err); + return Err; // Determine whether we've already imported this decl. // FriendDecl is not a NamedDecl so we cannot use lookup. @@ -3558,7 +3558,7 @@ if (NamedDecl *FriendD = D->getFriendDecl()) { NamedDecl *ToFriendD; if (Error Err = importInto(ToFriendD, FriendD)) - return std::move(Err); + return Err; if (FriendD->getFriendObjectKind() != Decl::FOK_None && !(FriendD->isInIdentifierNamespace(Decl::IDNS_NonMemberOperator))) @@ -3607,7 +3607,7 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -3672,7 +3672,7 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -3782,7 +3782,7 @@ } if (Error Err = ImportInitializer(D, ToVar)) - return std::move(Err); + return Err; if (D->isConstexpr()) ToVar->setConstexpr(true); @@ -3886,7 +3886,7 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -3995,7 +3995,7 @@ D->getSelectorLocs(FromSelLocs); SmallVector ToSelLocs(FromSelLocs.size()); if (Error Err = ImportContainerChecked(FromSelLocs, ToSelLocs)) - return std::move(Err); + return Err; ToMethod->setMethodParams(Importer.getToContext(), ToParams, ToSelLocs); @@ -4011,7 +4011,7 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -4043,13 +4043,13 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; ObjCInterfaceDecl *ToInterface; if (Error Err = importInto(ToInterface, D->getClassInterface())) - return std::move(Err); + return Err; // Determine if we've already encountered this category. ObjCCategoryDecl *MergeWithCategory @@ -4115,7 +4115,7 @@ // Import all of the members of this category. if (Error Err = ImportDeclContext(D)) - return std::move(Err); + return Err; // If we have an implementation, import it as well. if (D->getImplementation()) { @@ -4192,7 +4192,7 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -4225,7 +4225,7 @@ if (D->isThisDeclarationADefinition()) if (Error Err = ImportDefinition(D, ToProto)) - return std::move(Err); + return Err; return ToProto; } @@ -4233,7 +4233,7 @@ ExpectedDecl ASTNodeImporter::VisitLinkageSpecDecl(LinkageSpecDecl *D) { DeclContext *DC, *LexicalDC; if (Error Err = ImportDeclContext(D, DC, LexicalDC)) - return std::move(Err); + return Err; ExpectedSLoc ExternLocOrErr = import(D->getExternLoc()); if (!ExternLocOrErr) @@ -4270,7 +4270,7 @@ SourceLocation Loc; NamedDecl *ToD = nullptr; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -4284,7 +4284,7 @@ DeclarationNameInfo NameInfo(Name, ToLoc); if (Error Err = ImportDeclarationNameLoc(D->getNameInfo(), NameInfo)) - return std::move(Err); + return Err; UsingDecl *ToUsing; if (GetImportedOrCreateDecl(ToUsing, D, Importer.getToContext(), DC, @@ -4321,7 +4321,7 @@ SourceLocation Loc; NamedDecl *ToD = nullptr; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -4363,7 +4363,7 @@ SourceLocation Loc; NamedDecl *ToD = nullptr; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -4406,7 +4406,7 @@ SourceLocation Loc; NamedDecl *ToD = nullptr; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -4421,7 +4421,7 @@ DeclarationNameInfo NameInfo(Name, ToLoc); if (Error Err = ImportDeclarationNameLoc(D->getNameInfo(), NameInfo)) - return std::move(Err); + return Err; UnresolvedUsingValueDecl *ToUsingValue; if (GetImportedOrCreateDecl(ToUsingValue, D, Importer.getToContext(), DC, @@ -4443,7 +4443,7 @@ SourceLocation Loc; NamedDecl *ToD = nullptr; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -4616,7 +4616,7 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -4658,7 +4658,7 @@ if (D->isThisDeclarationADefinition()) if (Error Err = ImportDefinition(D, ToIface)) - return std::move(Err); + return Err; return ToIface; } @@ -4667,13 +4667,13 @@ ASTNodeImporter::VisitObjCCategoryImplDecl(ObjCCategoryImplDecl *D) { ObjCCategoryDecl *Category; if (Error Err = importInto(Category, D->getCategoryDecl())) - return std::move(Err); + return Err; ObjCCategoryImplDecl *ToImpl = Category->getImplementation(); if (!ToImpl) { DeclContext *DC, *LexicalDC; if (Error Err = ImportDeclContext(D, DC, LexicalDC)) - return std::move(Err); + return Err; SourceLocation ToLocation, ToAtStartLoc, ToCategoryNameLoc; if (auto Imp = importSeq( @@ -4695,7 +4695,7 @@ Importer.MapImported(D, ToImpl); if (Error Err = ImportDeclContext(D)) - return std::move(Err); + return Err; return ToImpl; } @@ -4705,12 +4705,12 @@ // Find the corresponding interface. ObjCInterfaceDecl *Iface; if (Error Err = importInto(Iface, D->getClassInterface())) - return std::move(Err); + return Err; // Import the superclass, if any. ObjCInterfaceDecl *Super; if (Error Err = importInto(Super, D->getSuperClass())) - return std::move(Err); + return Err; ObjCImplementationDecl *Impl = Iface->getImplementation(); if (!Impl) { @@ -4718,7 +4718,7 @@ // now. DeclContext *DC, *LexicalDC; if (Error Err = ImportDeclContext(D, DC, LexicalDC)) - return std::move(Err); + return Err; SourceLocation ToLocation, ToAtStartLoc, ToSuperClassLoc; SourceLocation ToIvarLBraceLoc, ToIvarRBraceLoc; @@ -4780,7 +4780,7 @@ // Import all of the members of this @implementation. if (Error Err = ImportDeclContext(D)) - return std::move(Err); + return Err; return Impl; } @@ -4792,7 +4792,7 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -4872,18 +4872,18 @@ ASTNodeImporter::VisitObjCPropertyImplDecl(ObjCPropertyImplDecl *D) { ObjCPropertyDecl *Property; if (Error Err = importInto(Property, D->getPropertyDecl())) - return std::move(Err); + return Err; DeclContext *DC, *LexicalDC; if (Error Err = ImportDeclContext(D, DC, LexicalDC)) - return std::move(Err); + return Err; auto *InImpl = cast(LexicalDC); // Import the ivar (for an @synthesize). ObjCIvarDecl *Ivar = nullptr; if (Error Err = importInto(Ivar, D->getPropertyIvarDecl())) - return std::move(Err); + return Err; ObjCPropertyImplDecl *ToImpl = InImpl->FindPropertyImplDecl(Property->getIdentifier(), @@ -5046,7 +5046,7 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -5094,7 +5094,7 @@ // Create the declaration that is being templated. CXXRecordDecl *ToTemplated; if (Error Err = importInto(ToTemplated, FromTemplated)) - return std::move(Err); + return Err; // Create the class template declaration itself. auto TemplateParamsOrErr = import(D->getTemplateParameters()); @@ -5155,18 +5155,18 @@ ClassTemplateSpecializationDecl *D) { ClassTemplateDecl *ClassTemplate; if (Error Err = importInto(ClassTemplate, D->getSpecializedTemplate())) - return std::move(Err); + return Err; // Import the context of this declaration. DeclContext *DC, *LexicalDC; if (Error Err = ImportDeclContext(D, DC, LexicalDC)) - return std::move(Err); + return Err; // Import template arguments. SmallVector TemplateArgs; if (Error Err = ImportTemplateArguments( D->getTemplateArgs().data(), D->getTemplateArgs().size(), TemplateArgs)) - return std::move(Err); + return Err; // Try to find an existing specialization with these template arguments. void *InsertPos = nullptr; @@ -5227,12 +5227,12 @@ TemplateArgumentListInfo ToTAInfo; const auto &ASTTemplateArgs = *PartialSpec->getTemplateArgsAsWritten(); if (Error Err = ImportTemplateArgumentListInfo(ASTTemplateArgs, ToTAInfo)) - return std::move(Err); + return Err; QualType CanonInjType; if (Error Err = importInto( CanonInjType, PartialSpec->getInjectedSpecializationType())) - return std::move(Err); + return Err; CanonInjType = CanonInjType.getCanonicalType(); auto ToTPListOrErr = import(PartialSpec->getTemplateParameters()); @@ -5312,7 +5312,7 @@ if (D->isCompleteDefinition()) if (Error Err = ImportDefinition(D, D2)) - return std::move(Err); + return Err; return D2; } @@ -5338,7 +5338,7 @@ SourceLocation Loc; NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -5386,7 +5386,7 @@ // Create the declaration that is being templated. VarDecl *ToTemplated; if (Error Err = importInto(ToTemplated, DTemplated)) - return std::move(Err); + return Err; // Create the variable template declaration itself. auto TemplateParamsOrErr = import(D->getTemplateParameters()); @@ -5427,12 +5427,12 @@ VarTemplateDecl *VarTemplate = nullptr; if (Error Err = importInto(VarTemplate, D->getSpecializedTemplate())) - return std::move(Err); + return Err; // Import the context of this declaration. DeclContext *DC, *LexicalDC; if (Error Err = ImportDeclContext(D, DC, LexicalDC)) - return std::move(Err); + return Err; // Import the location of this declaration. ExpectedSLoc BeginLocOrErr = import(D->getBeginLoc()); @@ -5447,7 +5447,7 @@ SmallVector TemplateArgs; if (Error Err = ImportTemplateArguments( D->getTemplateArgs().data(), D->getTemplateArgs().size(), TemplateArgs)) - return std::move(Err); + return Err; // Try to find an existing specialization with these template arguments. void *InsertPos = nullptr; @@ -5472,7 +5472,7 @@ // Import the type. QualType T; if (Error Err = importInto(T, D->getType())) - return std::move(Err); + return Err; auto TInfoOrErr = import(D->getTypeSourceInfo()); if (!TInfoOrErr) @@ -5481,7 +5481,7 @@ TemplateArgumentListInfo ToTAInfo; if (Error Err = ImportTemplateArgumentListInfo( D->getTemplateArgsInfo(), ToTAInfo)) - return std::move(Err); + return Err; using PartVarSpecDecl = VarTemplatePartialSpecializationDecl; // Create a new specialization. @@ -5492,7 +5492,7 @@ // NOTE: FromTAArgsAsWritten and template parameter list are non-null. if (Error Err = ImportTemplateArgumentListInfo( *FromTAArgsAsWritten, ArgInfos)) - return std::move(Err); + return Err; auto ToTPListOrErr = import(FromPartial->getTemplateParameters()); if (!ToTPListOrErr) @@ -5554,7 +5554,7 @@ } if (Error Err = ImportInitializer(D, D2)) - return std::move(Err); + return Err; return D2; } @@ -5567,7 +5567,7 @@ NamedDecl *ToD; if (Error Err = ImportDeclParts(D, DC, LexicalDC, Name, ToD, Loc)) - return std::move(Err); + return Err; if (ToD) return ToD; @@ -5608,7 +5608,7 @@ FunctionDecl *TemplatedFD; if (Error Err = importInto(TemplatedFD, D->getTemplatedDecl())) - return std::move(Err); + return Err; FunctionTemplateDecl *ToFunc; if (GetImportedOrCreateDecl(ToFunc, D, Importer.getToContext(), DC, Loc, Name, @@ -5694,15 +5694,15 @@ SmallVector Exprs(S->getNumOutputs() + S->getNumInputs() + S->getNumLabels()); if (Error Err = ImportContainerChecked(S->outputs(), Exprs)) - return std::move(Err); + return Err; if (Error Err = ImportArrayChecked(S->inputs(), Exprs.begin() + S->getNumOutputs())) - return std::move(Err); + return Err; if (Error Err = ImportArrayChecked( S->labels(), Exprs.begin() + S->getNumOutputs() + S->getNumInputs())) - return std::move(Err); + return Err; ExpectedSLoc AsmLocOrErr = import(S->getAsmLoc()); if (!AsmLocOrErr) @@ -5755,7 +5755,7 @@ SmallVector ToStmts(S->size()); if (Error Err = ImportContainerChecked(S->body(), ToStmts)) - return std::move(Err); + return Err; ExpectedSLoc ToLBracLocOrErr = import(S->getLBracLoc()); if (!ToLBracLocOrErr) @@ -5824,7 +5824,7 @@ ArrayRef FromAttrs(S->getAttrs()); SmallVector ToAttrs(FromAttrs.size()); if (Error Err = ImportContainerChecked(FromAttrs, ToAttrs)) - return std::move(Err); + return Err; ExpectedStmt ToSubStmtOrErr = import(S->getSubStmt()); if (!ToSubStmtOrErr) return ToSubStmtOrErr.takeError(); @@ -6280,7 +6280,7 @@ if (E->hasExplicitTemplateArgs()) { if (Error Err = ImportTemplateArgumentListInfo(E->template_arguments(), ToTAInfo)) - return std::move(Err); + return Err; ToResInfo = &ToTAInfo; } @@ -6321,7 +6321,7 @@ SmallVector ToDesignators(E->size()); if (Error Err = ImportContainerChecked(E->designators(), ToDesignators)) - return std::move(Err); + return Err; return DesignatedInitExpr::Create( Importer.getToContext(), ToDesignators, @@ -6405,7 +6405,7 @@ SmallVector ToLocations(E->getNumConcatenated()); if (Error Err = ImportArrayChecked( E->tokloc_begin(), E->tokloc_end(), ToLocations.begin())) - return std::move(Err); + return Err; return StringLiteral::Create( Importer.getToContext(), E->getBytes(), E->getKind(), E->isPascal(), @@ -6444,7 +6444,7 @@ if (Error Err = ImportArrayChecked( E->getSubExprs(), E->getSubExprs() + E->getNumSubExprs(), ToExprs.begin())) - return std::move(Err); + return Err; return new (Importer.getToContext()) AtomicExpr( ToBuiltinLoc, ToExprs, ToType, E->getOp(), ToRParenLoc); @@ -6499,7 +6499,7 @@ ExpectedStmt ASTNodeImporter::VisitParenListExpr(ParenListExpr *E) { SmallVector ToExprs(E->getNumExprs()); if (Error Err = ImportContainerChecked(E->exprs(), ToExprs)) - return std::move(Err); + return Err; ExpectedSLoc ToLParenLocOrErr = import(E->getLParenLoc()); if (!ToLParenLocOrErr) @@ -6971,7 +6971,7 @@ SmallVector ToArgs(E->getNumArgs()); if (Error Err = ImportContainerChecked(E->arguments(), ToArgs)) - return std::move(Err); + return Err; return CXXTemporaryObjectExpr::Create( Importer.getToContext(), ToConstructor, ToType, ToTypeSourceInfo, ToArgs, @@ -7035,7 +7035,7 @@ E->getPartialArguments().data(), E->getPartialArguments().size(), ToPartialArguments)) - return std::move(Err); + return Err; } return SizeOfPackExpr::Create( @@ -7066,7 +7066,7 @@ SmallVector ToPlacementArgs(E->getNumPlacementArgs()); if (Error Err = ImportContainerChecked(E->placement_arguments(), ToPlacementArgs)) - return std::move(Err); + return Err; return CXXNewExpr::Create( Importer.getToContext(), E->isGlobalNew(), ToOperatorNew, @@ -7109,7 +7109,7 @@ SmallVector ToArgs(E->getNumArgs()); if (Error Err = ImportContainerChecked(E->arguments(), ToArgs)) - return std::move(Err); + return Err; return CXXConstructExpr::Create( Importer.getToContext(), ToType, ToLocation, ToConstructor, @@ -7126,7 +7126,7 @@ SmallVector ToObjects(E->getNumObjects()); if (Error Err = ImportContainerChecked(E->getObjects(), ToObjects)) - return std::move(Err); + return Err; return ExprWithCleanups::Create( Importer.getToContext(), *ToSubExprOrErr, E->cleanupsHaveSideEffects(), @@ -7146,7 +7146,7 @@ SmallVector ToArgs(E->getNumArgs()); if (Error Err = ImportContainerChecked(E->arguments(), ToArgs)) - return std::move(Err); + return Err; return CXXMemberCallExpr::Create(Importer.getToContext(), ToCallee, ToArgs, ToType, E->getValueKind(), ToRParenLoc); @@ -7214,7 +7214,7 @@ if (Error Err = ImportTemplateArgumentListInfo(E->getLAngleLoc(), E->getRAngleLoc(), E->template_arguments(), ToTAInfo)) - return std::move(Err); + return Err; ResInfo = &ToTAInfo; } @@ -7289,7 +7289,7 @@ if (Error Err = ImportTemplateArgumentListInfo( E->getLAngleLoc(), E->getRAngleLoc(), E->template_arguments(), ToTAInfo)) - return std::move(Err); + return Err; ResInfo = &ToTAInfo; } @@ -7301,7 +7301,7 @@ // Import additional name location/type info. if (Error Err = ImportDeclarationNameLoc( E->getMemberNameInfo(), ToMemberNameInfo)) - return std::move(Err); + return Err; return CXXDependentScopeMemberExpr::Create( Importer.getToContext(), ToBase, ToType, E->isArrow(), ToOperatorLoc, @@ -7326,14 +7326,14 @@ DeclarationNameInfo ToNameInfo(ToDeclName, ToExprLoc); if (Error Err = ImportDeclarationNameLoc(E->getNameInfo(), ToNameInfo)) - return std::move(Err); + return Err; TemplateArgumentListInfo ToTAInfo(ToLAngleLoc, ToRAngleLoc); TemplateArgumentListInfo *ResInfo = nullptr; if (E->hasExplicitTemplateArgs()) { if (Error Err = ImportTemplateArgumentListInfo(E->template_arguments(), ToTAInfo)) - return std::move(Err); + return Err; ResInfo = &ToTAInfo; } @@ -7356,7 +7356,7 @@ SmallVector ToArgs(E->arg_size()); if (Error Err = ImportArrayChecked(E->arg_begin(), E->arg_end(), ToArgs.begin())) - return std::move(Err); + return Err; return CXXUnresolvedConstructExpr::Create( Importer.getToContext(), ToTypeSourceInfo, ToLParenLoc, @@ -7380,7 +7380,7 @@ std::get<0>(*ToNameInfoOrErr), std::get<1>(*ToNameInfoOrErr)); // Import additional name location/type info. if (Error Err = ImportDeclarationNameLoc(E->getNameInfo(), ToNameInfo)) - return std::move(Err); + return Err; UnresolvedSet<8> ToDecls; for (auto *D : E->decls()) @@ -7394,7 +7394,7 @@ if (Error Err = ImportTemplateArgumentListInfo( E->getLAngleLoc(), E->getRAngleLoc(), E->template_arguments(), ToTAInfo)) - return std::move(Err); + return Err; ExpectedSLoc ToTemplateKeywordLocOrErr = import(E->getTemplateKeywordLoc()); if (!ToTemplateKeywordLocOrErr) @@ -7431,7 +7431,7 @@ DeclarationNameInfo ToNameInfo(std::get<0>(*Imp2), std::get<1>(*Imp2)); // Import additional name location/type info. if (Error Err = ImportDeclarationNameLoc(E->getNameInfo(), ToNameInfo)) - return std::move(Err); + return Err; UnresolvedSet<8> ToDecls; for (Decl *D : E->decls()) @@ -7445,7 +7445,7 @@ if (E->hasExplicitTemplateArgs()) { if (Error Err = ImportTemplateArgumentListInfo(E->template_arguments(), ToTAInfo)) - return std::move(Err); + return Err; ResInfo = &ToTAInfo; } @@ -7476,7 +7476,7 @@ unsigned NumArgs = E->getNumArgs(); llvm::SmallVector ToArgs(NumArgs); if (Error Err = ImportContainerChecked(E->arguments(), ToArgs)) - return std::move(Err); + return Err; if (const auto *OCE = dyn_cast(E)) { return CXXOperatorCallExpr::Create( @@ -7512,7 +7512,7 @@ SmallVector ToCaptureInits(E->capture_size()); if (Error Err = ImportContainerChecked(E->capture_inits(), ToCaptureInits)) - return std::move(Err); + return Err; auto Imp = importSeq( E->getIntroducerRange(), E->getCaptureDefaultLoc(), E->getEndLoc()); @@ -7542,7 +7542,7 @@ SmallVector ToExprs(E->getNumInits()); if (Error Err = ImportContainerChecked(E->inits(), ToExprs)) - return std::move(Err); + return Err; ASTContext &ToCtx = Importer.getToContext(); InitListExpr *To = new (ToCtx) InitListExpr( @@ -7717,7 +7717,7 @@ SmallVector ToArgs(E->getNumArgs()); if (Error Err = ImportContainerChecked(E->getArgs(), ToArgs)) - return std::move(Err); + return Err; // According to Sema::BuildTypeTrait(), if E is value-dependent, // Value is always false. @@ -8061,7 +8061,7 @@ } else if (FromRecord->isCompleteDefinition()) { if (Error Err = ASTNodeImporter(*this).ImportDefinition( FromRecord, ToRecord, ASTNodeImporter::IDK_Basic)) - return std::move(Err); + return Err; } else { CompleteDecl(ToRecord); } @@ -8072,7 +8072,7 @@ } else if (FromEnum->isCompleteDefinition()) { if (Error Err = ASTNodeImporter(*this).ImportDefinition( FromEnum, ToEnum, ASTNodeImporter::IDK_Basic)) - return std::move(Err); + return Err; } else { CompleteDecl(ToEnum); } @@ -8083,7 +8083,7 @@ } else if (ObjCInterfaceDecl *FromDef = FromClass->getDefinition()) { if (Error Err = ASTNodeImporter(*this).ImportDefinition( FromDef, ToClass, ASTNodeImporter::IDK_Basic)) - return std::move(Err); + return Err; } else { CompleteDecl(ToClass); } @@ -8094,7 +8094,7 @@ } else if (ObjCProtocolDecl *FromDef = FromProto->getDefinition()) { if (Error Err = ASTNodeImporter(*this).ImportDefinition( FromDef, ToProto, ASTNodeImporter::IDK_Basic)) - return std::move(Err); + return Err; } else { CompleteDecl(ToProto); } @@ -8150,7 +8150,7 @@ NestedNameSpecifier *Prefix = nullptr; if (Error Err = importInto(Prefix, FromNNS->getPrefix())) - return std::move(Err); + return Err; switch (FromNNS->getKind()) { case NestedNameSpecifier::Identifier: @@ -8217,18 +8217,18 @@ NNS = NestedNames.pop_back_val(); NestedNameSpecifier *Spec = nullptr; if (Error Err = importInto(Spec, NNS.getNestedNameSpecifier())) - return std::move(Err); + return Err; NestedNameSpecifier::SpecifierKind Kind = Spec->getKind(); SourceLocation ToLocalBeginLoc, ToLocalEndLoc; if (Kind != NestedNameSpecifier::Super) { if (Error Err = importInto(ToLocalBeginLoc, NNS.getLocalBeginLoc())) - return std::move(Err); + return Err; if (Kind != NestedNameSpecifier::Global) if (Error Err = importInto(ToLocalEndLoc, NNS.getLocalEndLoc())) - return std::move(Err); + return Err; } switch (Kind) { @@ -8251,7 +8251,7 @@ case NestedNameSpecifier::TypeSpecWithTemplate: { SourceLocation ToTLoc; if (Error Err = importInto(ToTLoc, NNS.getTypeLoc().getBeginLoc())) - return std::move(Err); + return Err; TypeSourceInfo *TSI = getToContext().getTrivialTypeSourceInfo( QualType(Spec->getAsType(), 0), ToTLoc); Builder.Extend(getToContext(), ToLocalBeginLoc, TSI->getTypeLoc(), @@ -8390,9 +8390,9 @@ Expected ASTImporter::Import(SourceRange FromRange) { SourceLocation ToBegin, ToEnd; if (Error Err = importInto(ToBegin, FromRange.getBegin())) - return std::move(Err); + return Err; if (Error Err = importInto(ToEnd, FromRange.getEnd())) - return std::move(Err); + return Err; return SourceRange(ToBegin, ToEnd); } @@ -8501,7 +8501,7 @@ SourceLocation EllipsisLoc; if (From->isPackExpansion()) if (Error Err = importInto(EllipsisLoc, From->getEllipsisLoc())) - return std::move(Err); + return Err; return new (ToContext) CXXCtorInitializer( ToContext, *ToTInfoOrErr, From->isBaseVirtual(), *LParenLocOrErr, Index: clang/lib/ASTMatchers/ASTMatchersInternal.cpp =================================================================== --- clang/lib/ASTMatchers/ASTMatchersInternal.cpp +++ clang/lib/ASTMatchers/ASTMatchersInternal.cpp @@ -241,7 +241,7 @@ auto Result = *this; Result.Implementation = new IdDynMatcher(ID, std::move(Result.Implementation)); - return std::move(Result); + return Result; } bool DynTypedMatcher::canConvertTo(ast_type_traits::ASTNodeKind To) const { Index: clang/lib/CodeGen/CodeGenAction.cpp =================================================================== --- clang/lib/CodeGen/CodeGenAction.cpp +++ clang/lib/CodeGen/CodeGenAction.cpp @@ -919,7 +919,7 @@ CI.getPreprocessor().addPPCallbacks(std::move(Callbacks)); } - return std::move(Result); + return Result; } static void BitcodeInlineAsmDiagHandler(const llvm::SMDiagnostic &SM, Index: clang/lib/CrossTU/CrossTranslationUnit.cpp =================================================================== --- clang/lib/CrossTU/CrossTranslationUnit.cpp +++ clang/lib/CrossTU/CrossTranslationUnit.cpp @@ -395,7 +395,7 @@ // Ensure that the Index is loaded, as we need to search in it. if (llvm::Error IndexLoadError = ensureCTUIndexLoaded(CrossTUDir, IndexName)) - return std::move(IndexLoadError); + return IndexLoadError; // Check if there is and entry in the index for the function. if (!NameFileMap.count(FunctionName)) { @@ -425,7 +425,7 @@ CrossTranslationUnitContext::ASTUnitStorage::getFileForFunction( StringRef FunctionName, StringRef CrossTUDir, StringRef IndexName) { if (llvm::Error IndexLoadError = ensureCTUIndexLoaded(CrossTUDir, IndexName)) - return std::move(IndexLoadError); + return IndexLoadError; return NameFileMap[FunctionName]; } Index: clang/lib/Driver/DriverOptions.cpp =================================================================== --- clang/lib/Driver/DriverOptions.cpp +++ clang/lib/Driver/DriverOptions.cpp @@ -48,5 +48,5 @@ #define OPTTABLE_ARG_INIT #include "clang/Driver/Options.inc" #undef OPTTABLE_ARG_INIT - return std::move(Result); + return Result; } Index: clang/lib/Frontend/CompilerInstance.cpp =================================================================== --- clang/lib/Frontend/CompilerInstance.cpp +++ clang/lib/Frontend/CompilerInstance.cpp @@ -790,12 +790,12 @@ *TempPathName = TempFile; if (!Binary || OS->supportsSeeking()) - return std::move(OS); + return OS; auto B = llvm::make_unique(*OS); assert(!NonSeekStream); NonSeekStream = std::move(OS); - return std::move(B); + return B; } // Initialization Utilities Index: clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp =================================================================== --- clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp +++ clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp @@ -84,7 +84,7 @@ P->getActionType() != PluginASTAction::Cmdline) || !P->ParseArgs(CI, CI.getFrontendOpts().PluginArgs[it->getName()])) return nullptr; - return std::move(P); + return P; } } Index: clang/lib/StaticAnalyzer/Checkers/LocalizationChecker.cpp =================================================================== --- clang/lib/StaticAnalyzer/Checkers/LocalizationChecker.cpp +++ clang/lib/StaticAnalyzer/Checkers/LocalizationChecker.cpp @@ -1028,7 +1028,7 @@ L, "Non-localized string literal here"); Piece->addRange(LiteralExpr->getSourceRange()); - return std::move(Piece); + return Piece; } namespace { Index: clang/lib/StaticAnalyzer/Checkers/RetainCountChecker/RetainCountDiagnostics.cpp =================================================================== --- clang/lib/StaticAnalyzer/Checkers/RetainCountChecker/RetainCountDiagnostics.cpp +++ clang/lib/StaticAnalyzer/Checkers/RetainCountChecker/RetainCountDiagnostics.cpp @@ -600,7 +600,7 @@ break; } - return std::move(P); + return P; } static Optional describeRegion(const MemRegion *MR) { Index: clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp =================================================================== --- clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp +++ clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp @@ -1514,7 +1514,7 @@ auto X = std::make_shared(L, os.str()); X->setTag(getTag()); - return std::move(X); + return X; } return nullptr; @@ -2489,7 +2489,7 @@ event->setPrunable(false); } } - return std::move(event); + return event; } std::shared_ptr ConditionBRVisitor::VisitTrueTest( Index: clang/lib/Tooling/CommonOptionsParser.cpp =================================================================== --- clang/lib/Tooling/CommonOptionsParser.cpp +++ clang/lib/Tooling/CommonOptionsParser.cpp @@ -161,8 +161,8 @@ llvm::Error Err = Parser.init(argc, argv, Category, OccurrencesFlag, Overview); if (Err) - return std::move(Err); - return std::move(Parser); + return Err; + return Parser; } CommonOptionsParser::CommonOptionsParser( Index: clang/lib/Tooling/Refactoring/ASTSelection.cpp =================================================================== --- clang/lib/Tooling/Refactoring/ASTSelection.cpp +++ clang/lib/Tooling/Refactoring/ASTSelection.cpp @@ -57,7 +57,7 @@ SelectionStack.pop_back(); if (Result.Children.empty()) return None; - return std::move(Result); + return Result; } bool TraversePseudoObjectExpr(PseudoObjectExpr *E) { Index: clang/lib/Tooling/Refactoring/AtomicChange.cpp =================================================================== --- clang/lib/Tooling/Refactoring/AtomicChange.cpp +++ clang/lib/Tooling/Refactoring/AtomicChange.cpp @@ -159,7 +159,7 @@ llvm::Error Err = HeaderReplacements.add( tooling::Replacement(FilePath, UINT_MAX, 0, ReplacementText)); if (Err) - return std::move(Err); + return Err; } for (const std::string &Header : Change.getRemovedHeaders()) { // Offset UINT_MAX and length 1 indicate that the replacement is a header @@ -167,7 +167,7 @@ llvm::Error Err = HeaderReplacements.add(Replacement(FilePath, UINT_MAX, 1, Header)); if (Err) - return std::move(Err); + return Err; } } @@ -187,7 +187,7 @@ for (const auto &R : Change.getReplacements()) if (auto Err = Replaces.add(Replacement( FilePath, R.getOffset(), R.getLength(), R.getReplacementText()))) - return std::move(Err); + return Err; return Replaces; } Index: clang/lib/Tooling/Refactoring/Extract/Extract.cpp =================================================================== --- clang/lib/Tooling/Refactoring/Extract/Extract.cpp +++ clang/lib/Tooling/Refactoring/Extract/Extract.cpp @@ -169,7 +169,7 @@ OS << "\n}\n\n"; auto Err = Change.insert(SM, ExtractedDeclLocation, OS.str()); if (Err) - return std::move(Err); + return Err; } // Create the replacement for the call to the extracted declaration. @@ -186,7 +186,7 @@ auto Err = Change.replace( SM, CharSourceRange::getTokenRange(ExtractedRange), OS.str()); if (Err) - return std::move(Err); + return Err; } // FIXME: Add support for assocciated symbol location to AtomicChange to mark Index: clang/lib/Tooling/Refactoring/Rename/RenamingAction.cpp =================================================================== --- clang/lib/Tooling/Refactoring/Rename/RenamingAction.cpp +++ clang/lib/Tooling/Refactoring/Rename/RenamingAction.cpp @@ -156,11 +156,11 @@ Change.replace(SM, CharSourceRange::getCharRange(Range.value()), NewName.getNamePieces()[Range.index()]); if (Error) - return std::move(Error); + return Error; } Changes.push_back(std::move(Change)); } - return std::move(Changes); + return Changes; } /// Takes each atomic change and inserts its replacements into the set of Index: clang/lib/Tooling/Refactoring/Stencil.cpp =================================================================== --- clang/lib/Tooling/Refactoring/Stencil.cpp +++ clang/lib/Tooling/Refactoring/Stencil.cpp @@ -158,7 +158,7 @@ std::string Result; for (const auto &Part : Parts) if (auto Err = Part.eval(Match, &Result)) - return std::move(Err); + return Err; return Result; } Index: clang/tools/clang-import-test/clang-import-test.cpp =================================================================== --- clang/tools/clang-import-test/clang-import-test.cpp +++ clang/tools/clang-import-test/clang-import-test.cpp @@ -327,14 +327,14 @@ Consumers.Initialize(CI.getASTContext()); if (llvm::Error PE = ParseSource(Path, CI.getCompilerInstance(), Consumers)) - return std::move(PE); + return PE; CI.getDiagnosticClient().EndSourceFile(); if (ShouldDumpIR) CG.GetModule()->print(llvm::outs(), nullptr); if (CI.getDiagnosticClient().getNumErrors()) return llvm::make_error( "Errors occurred while parsing the expression.", std::error_code()); - return std::move(CI); + return CI; } void Forget(CIAndOrigins &CI, llvm::MutableArrayRef Imports) { Index: clang/tools/clang-refactor/TestSupport.cpp =================================================================== --- clang/tools/clang-refactor/TestSupport.cpp +++ clang/tools/clang-refactor/TestSupport.cpp @@ -384,7 +384,7 @@ TestSelectionRangesInFile TestRanges = {Filename.str(), {}}; for (auto &Group : GroupedRanges) TestRanges.GroupedRanges.push_back({Group.first, std::move(Group.second)}); - return std::move(TestRanges); + return TestRanges; } } // end namespace refactor Index: llvm/include/llvm/Bitstream/BitstreamReader.h =================================================================== --- llvm/include/llvm/Bitstream/BitstreamReader.h +++ llvm/include/llvm/Bitstream/BitstreamReader.h @@ -209,7 +209,7 @@ unsigned BitsLeft = NumBits - BitsInCurWord; if (Error fillResult = fillCurWord()) - return std::move(fillResult); + return fillResult; // If we run out of data, abort. if (BitsLeft > BitsInCurWord) @@ -424,7 +424,7 @@ // We read and accumulate abbrev's, the client can't do anything with // them anyway. if (Error Err = ReadAbbrevRecord()) - return std::move(Err); + return Err; continue; } @@ -447,7 +447,7 @@ // If we found a sub-block, just skip over it and check the next entry. if (Error Err = SkipBlock()) - return std::move(Err); + return Err; } } Index: llvm/include/llvm/DebugInfo/CodeView/CVRecord.h =================================================================== --- llvm/include/llvm/DebugInfo/CodeView/CVRecord.h +++ llvm/include/llvm/DebugInfo/CodeView/CVRecord.h @@ -100,14 +100,14 @@ Reader.setOffset(Offset); if (auto EC = Reader.readObject(Prefix)) - return std::move(EC); + return EC; if (Prefix->RecordLen < 2) return make_error(cv_error_code::corrupt_record); Reader.setOffset(Offset); ArrayRef RawData; if (auto EC = Reader.readBytes(RawData, Prefix->RecordLen + sizeof(uint16_t))) - return std::move(EC); + return EC; return codeview::CVRecord(RawData); } Index: llvm/include/llvm/DebugInfo/CodeView/SymbolDeserializer.h =================================================================== --- llvm/include/llvm/DebugInfo/CodeView/SymbolDeserializer.h +++ llvm/include/llvm/DebugInfo/CodeView/SymbolDeserializer.h @@ -48,7 +48,7 @@ template static Expected deserializeAs(CVSymbol Symbol) { T Record(static_cast(Symbol.kind())); if (auto EC = deserializeAs(Symbol, Record)) - return std::move(EC); + return EC; return Record; } Index: llvm/include/llvm/DebugInfo/DWARF/DWARFListTable.h =================================================================== --- llvm/include/llvm/DebugInfo/DWARF/DWARFListTable.h +++ llvm/include/llvm/DebugInfo/DWARF/DWARFListTable.h @@ -273,7 +273,7 @@ if (Error E = List.extract(Data, getHeaderOffset(), End, &Offset, Header.getSectionName(), Header.getListTypeString())) - return std::move(E); + return E; ListMap[StartingOffset] = List; return List; } Index: llvm/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h =================================================================== --- llvm/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h +++ llvm/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h @@ -233,7 +233,7 @@ if (auto Sym = BaseLayer.findSymbolIn(BLK, Name, ExportedSymbolsOnly)) return Sym; else if (auto Err = Sym.takeError()) - return std::move(Err); + return Err; return nullptr; } @@ -341,7 +341,7 @@ if (auto Sym = findSymbolIn(KV.first, Name, ExportedSymbolsOnly)) return Sym; else if (auto Err = Sym.takeError()) - return std::move(Err); + return Err; } return BaseLayer.findSymbol(Name, ExportedSymbolsOnly); } @@ -405,7 +405,7 @@ if (auto Sym = LD.findSymbol(BaseLayer, MangledName, false)) continue; else if (auto Err = Sym.takeError()) - return std::move(Err); + return Err; } // Record all functions defined by this module. @@ -518,7 +518,7 @@ if (auto Sym = LD.findSymbol(BaseLayer, Name, false)) return Sym; else if (auto Err = Sym.takeError()) - return std::move(Err); + return Err; return nullptr; }; @@ -611,7 +611,7 @@ } else return FnBodyAddrOrErr.takeError(); } else if (auto Err = FnBodySym.takeError()) - return std::move(Err); + return Err; else llvm_unreachable("Function not emitted for partition"); } @@ -729,7 +729,7 @@ SetSymbolResolver(K, std::move(Resolver)); if (auto Err = BaseLayer.addModule(std::move(K), std::move(M))) - return std::move(Err); + return Err; return K; } Index: llvm/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h =================================================================== --- llvm/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h +++ llvm/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h @@ -80,8 +80,8 @@ new LocalTrampolinePool(std::move(GetTrampolineLanding), Err)); if (Err) - return std::move(Err); - return std::move(LTP); + return Err; + return LTP; } /// Get a free trampoline. Returns an error if one can not be provide (e.g. @@ -90,7 +90,7 @@ std::lock_guard Lock(LTPMutex); if (AvailableTrampolines.empty()) { if (auto Err = grow()) - return std::move(Err); + return Err; } assert(!AvailableTrampolines.empty() && "Failed to grow trampoline pool"); auto TrampolineAddr = AvailableTrampolines.back(); @@ -229,8 +229,8 @@ auto CCMgr = std::unique_ptr( new LocalJITCompileCallbackManager(ES, ErrorHandlerAddress, Err)); if (Err) - return std::move(Err); - return std::move(CCMgr); + return Err; + return CCMgr; } private: Index: llvm/include/llvm/ExecutionEngine/Orc/LLJIT.h =================================================================== --- llvm/include/llvm/ExecutionEngine/Orc/LLJIT.h +++ llvm/include/llvm/ExecutionEngine/Orc/LLJIT.h @@ -257,13 +257,13 @@ /// Create an instance of the JIT. Expected> create() { if (auto Err = impl().prepareForConstruction()) - return std::move(Err); + return Err; Error Err = Error::success(); std::unique_ptr J(new JITType(impl(), Err)); if (Err) - return std::move(Err); - return std::move(J); + return Err; + return J; } protected: Index: llvm/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h =================================================================== --- llvm/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h +++ llvm/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h @@ -61,13 +61,13 @@ else if (this->EmitState == NotEmitted) { this->EmitState = Emitting; if (auto Err = this->emitToBaseLayer(B)) - return std::move(Err); + return Err; this->EmitState = Emitted; } if (auto Sym = B.findSymbolIn(K, PName, ExportedSymbolsOnly)) return Sym.getAddress(); else if (auto Err = Sym.takeError()) - return std::move(Err); + return Err; else llvm_unreachable("Successful symbol lookup should return " "definition address here"); Index: llvm/include/llvm/ExecutionEngine/Orc/LazyReexports.h =================================================================== --- llvm/include/llvm/ExecutionEngine/Orc/LazyReexports.h +++ llvm/include/llvm/ExecutionEngine/Orc/LazyReexports.h @@ -137,9 +137,9 @@ new LocalLazyCallThroughManager(ES, ErrorHandlerAddr)); if (auto Err = LLCTM->init()) - return std::move(Err); + return Err; - return std::move(LLCTM); + return LLCTM; } }; Index: llvm/include/llvm/ExecutionEngine/Orc/Legacy.h =================================================================== --- llvm/include/llvm/ExecutionEngine/Orc/Legacy.h +++ llvm/include/llvm/ExecutionEngine/Orc/Legacy.h @@ -123,7 +123,7 @@ if (!Sym.getFlags().isStrong()) Result.insert(S); } else if (auto Err = Sym.takeError()) - return std::move(Err); + return Err; } return Result; Index: llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h =================================================================== --- llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h +++ llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h @@ -457,7 +457,7 @@ std::lock_guard Lock(RTPMutex); if (AvailableTrampolines.empty()) { if (auto Err = grow()) - return std::move(Err); + return Err; } assert(!AvailableTrampolines.empty() && "Failed to grow trampoline pool"); auto TrampolineAddr = AvailableTrampolines.back(); @@ -506,8 +506,8 @@ auto Client = std::unique_ptr( new OrcRemoteTargetClient(Channel, ES, Err)); if (Err) - return std::move(Err); - return std::move(Client); + return Err; + return Client; } /// Call the int(void) function at the given address in the target and return @@ -541,7 +541,7 @@ createRemoteMemoryManager() { auto Id = AllocatorIds.getNext(); if (auto Err = callB(Id)) - return std::move(Err); + return Err; return std::unique_ptr( new RemoteRTDyldMemoryManager(*this, Id)); } @@ -552,7 +552,7 @@ createIndirectStubsManager() { auto Id = IndirectStubOwnerIds.getNext(); if (auto Err = callB(Id)) - return std::move(Err); + return Err; return llvm::make_unique(*this, Id); } @@ -562,7 +562,7 @@ // Emit the resolver block on the JIT server. if (auto Err = callB()) - return std::move(Err); + return Err; // Create the callback manager. CallbackManager.emplace(*this, ES, ErrorHandlerAddress); Index: llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h =================================================================== --- llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h +++ llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h @@ -265,7 +265,7 @@ typename TargetT::IndirectStubsInfo IS; if (auto Err = TargetT::emitIndirectStubsBlock(IS, NumStubsRequired, nullptr)) - return std::move(Err); + return Err; JITTargetAddress StubsBase = static_cast( reinterpret_cast(IS.getStub(0))); @@ -382,7 +382,7 @@ auto &Allocator = I->second; void *LocalAllocAddr = nullptr; if (auto Err = Allocator.allocate(LocalAllocAddr, Size, Align)) - return std::move(Err); + return Err; LLVM_DEBUG(dbgs() << " Allocator " << Id << " reserved " << LocalAllocAddr << " (" << Size << " bytes, alignment " << Align Index: llvm/include/llvm/ExecutionEngine/Orc/RPCUtils.h =================================================================== --- llvm/include/llvm/ExecutionEngine/Orc/RPCUtils.h +++ llvm/include/llvm/ExecutionEngine/Orc/RPCUtils.h @@ -1415,9 +1415,9 @@ }, Args...)) { RTraits::consumeAbandoned(FutureResult.get()); - return std::move(Err); + return Err; } - return std::move(FutureResult); + return FutureResult; } /// The same as appendCallNBWithSeq, except that it calls C.send() to @@ -1431,7 +1431,7 @@ this->abandonPendingResponses(); detail::ResultTraits::consumeAbandoned( std::move(Result->get())); - return std::move(Err); + return Err; } return Result; } @@ -1520,14 +1520,14 @@ Args...)) { detail::ResultTraits::consumeAbandoned( std::move(Result)); - return std::move(Err); + return Err; } while (!ReceivedResponse) { if (auto Err = this->handleOne()) { detail::ResultTraits::consumeAbandoned( std::move(Result)); - return std::move(Err); + return Err; } } Index: llvm/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h =================================================================== --- llvm/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h +++ llvm/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h @@ -274,7 +274,7 @@ // and its execution, so we need to double check. if (!this->Finalized) if (auto Err = this->finalize()) - return std::move(Err); + return Err; return this->getSymbol(Name, false).getAddress(); }; } @@ -428,7 +428,7 @@ if (auto Sym = KV.second->getSymbol(Name, ExportedSymbolsOnly)) return Sym; else if (auto Err = Sym.takeError()) - return std::move(Err); + return Err; return nullptr; } Index: llvm/include/llvm/Object/ELFObjectFile.h =================================================================== --- llvm/include/llvm/Object/ELFObjectFile.h +++ llvm/include/llvm/Object/ELFObjectFile.h @@ -939,7 +939,7 @@ ELFObjectFile::create(MemoryBufferRef Object) { auto EFOrErr = ELFFile::create(Object.getBuffer()); if (Error E = EFOrErr.takeError()) - return std::move(E); + return E; auto EF = std::move(*EFOrErr); auto SectionsOrErr = EF.sections(); Index: llvm/include/llvm/ProfileData/Coverage/CoverageMappingReader.h =================================================================== --- llvm/include/llvm/ProfileData/Coverage/CoverageMappingReader.h +++ llvm/include/llvm/ProfileData/Coverage/CoverageMappingReader.h @@ -77,7 +77,7 @@ if (ReadErr != coveragemap_error::success) { auto E = make_error(ReadErr); ReadErr = coveragemap_error::success; - return std::move(E); + return E; } return Record; } @@ -85,7 +85,7 @@ if (ReadErr != coveragemap_error::success) { auto E = make_error(ReadErr); ReadErr = coveragemap_error::success; - return std::move(E); + return E; } return &Record; } Index: llvm/lib/Bitcode/Reader/BitcodeAnalyzer.cpp =================================================================== --- llvm/lib/Bitcode/Reader/BitcodeAnalyzer.cpp +++ llvm/lib/Bitcode/Reader/BitcodeAnalyzer.cpp @@ -415,41 +415,41 @@ char Signature[6]; if (Error Err = tryRead(Signature[0], 8)) - return std::move(Err); + return Err; if (Error Err = tryRead(Signature[1], 8)) - return std::move(Err); + return Err; // Autodetect the file contents, if it is one we know. if (Signature[0] == 'C' && Signature[1] == 'P') { if (Error Err = tryRead(Signature[2], 8)) - return std::move(Err); + return Err; if (Error Err = tryRead(Signature[3], 8)) - return std::move(Err); + return Err; if (Signature[2] == 'C' && Signature[3] == 'H') return ClangSerializedASTBitstream; } else if (Signature[0] == 'D' && Signature[1] == 'I') { if (Error Err = tryRead(Signature[2], 8)) - return std::move(Err); + return Err; if (Error Err = tryRead(Signature[3], 8)) - return std::move(Err); + return Err; if (Signature[2] == 'A' && Signature[3] == 'G') return ClangSerializedDiagnosticsBitstream; } else if (Signature[0] == 'R' && Signature[1] == 'M') { if (Error Err = tryRead(Signature[2], 8)) - return std::move(Err); + return Err; if (Error Err = tryRead(Signature[3], 8)) - return std::move(Err); + return Err; if (Signature[2] == 'R' && Signature[3] == 'K') return LLVMBitstreamRemarks; } else { if (Error Err = tryRead(Signature[2], 4)) - return std::move(Err); + return Err; if (Error Err = tryRead(Signature[3], 4)) - return std::move(Err); + return Err; if (Error Err = tryRead(Signature[4], 4)) - return std::move(Err); + return Err; if (Error Err = tryRead(Signature[5], 4)) - return std::move(Err); + return Err; if (Signature[0] == 'B' && Signature[1] == 'C' && Signature[2] == 0x0 && Signature[3] == 0xC && Signature[4] == 0xE && Signature[5] == 0xD) return LLVMIRBitstream; Index: llvm/lib/Bitcode/Reader/BitcodeReader.cpp =================================================================== --- llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -141,9 +141,9 @@ BitstreamCursor Stream(ArrayRef(BufPtr, BufEnd)); if (Error Err = hasInvalidBitcodeHeader(Stream)) - return std::move(Err); + return Err; - return std::move(Stream); + return Stream; } /// Convert a string from a record into an std::string, return true on failure. @@ -172,7 +172,7 @@ /// "epoch" encoded in the bitcode, and return the producer name if any. static Expected readIdentificationBlock(BitstreamCursor &Stream) { if (Error Err = Stream.EnterSubBlock(bitc::IDENTIFICATION_BLOCK_ID)) - return std::move(Err); + return Err; // Read all the records. SmallVector Record; @@ -244,7 +244,7 @@ // Ignore other sub-blocks. if (Error Err = Stream.SkipBlock()) - return std::move(Err); + return Err; continue; case BitstreamEntry::Record: if (Expected Skipped = Stream.skipRecord(Entry.ID)) @@ -257,7 +257,7 @@ static Expected hasObjCCategoryInModule(BitstreamCursor &Stream) { if (Error Err = Stream.EnterSubBlock(bitc::MODULE_BLOCK_ID)) - return std::move(Err); + return Err; SmallVector Record; // Read all the records for this module. @@ -324,7 +324,7 @@ // Ignore other sub-blocks. if (Error Err = Stream.SkipBlock()) - return std::move(Err); + return Err; continue; case BitstreamEntry::Record: @@ -338,7 +338,7 @@ static Expected readModuleTriple(BitstreamCursor &Stream) { if (Error Err = Stream.EnterSubBlock(bitc::MODULE_BLOCK_ID)) - return std::move(Err); + return Err; SmallVector Record; @@ -402,7 +402,7 @@ // Ignore other sub-blocks. if (Error Err = Stream.SkipBlock()) - return std::move(Err); + return Err; continue; case BitstreamEntry::Record: @@ -2040,7 +2040,7 @@ // of the VST read. uint64_t CurrentBit = Stream.GetCurrentBitNo(); if (Error JumpFailed = Stream.JumpToBit(Offset * 32)) - return std::move(JumpFailed); + return JumpFailed; Expected MaybeEntry = Stream.advance(); if (!MaybeEntry) return MaybeEntry.takeError(); @@ -6250,7 +6250,7 @@ static Expected readBlobInRecord(BitstreamCursor &Stream, unsigned Block, unsigned RecordID) { if (Error Err = Stream.EnterSubBlock(Block)) - return std::move(Err); + return Err; StringRef Strtab; while (true) { @@ -6268,7 +6268,7 @@ case BitstreamEntry::SubBlock: if (Error Err = Stream.SkipBlock()) - return std::move(Err); + return Err; break; case BitstreamEntry::Record: @@ -6329,7 +6329,7 @@ if (Entry.ID == bitc::IDENTIFICATION_BLOCK_ID) { IdentificationBit = Stream.GetCurrentBitNo() - BCBegin * 8; if (Error Err = Stream.SkipBlock()) - return std::move(Err); + return Err; { Expected MaybeEntry = Stream.advance(); @@ -6346,7 +6346,7 @@ if (Entry.ID == bitc::MODULE_BLOCK_ID) { uint64_t ModuleBit = Stream.GetCurrentBitNo() - BCBegin * 8; if (Error Err = Stream.SkipBlock()) - return std::move(Err); + return Err; F.Mods.push_back({Stream.getBitcodeBytes().slice( BCBegin, Stream.getCurrentByteNo() - BCBegin), @@ -6395,7 +6395,7 @@ } if (Error Err = Stream.SkipBlock()) - return std::move(Err); + return Err; continue; } case BitstreamEntry::Record: @@ -6423,7 +6423,7 @@ std::string ProducerIdentification; if (IdentificationBit != -1ull) { if (Error JumpFailed = Stream.JumpToBit(IdentificationBit)) - return std::move(JumpFailed); + return JumpFailed; Expected ProducerIdentificationOrErr = readIdentificationBlock(Stream); if (!ProducerIdentificationOrErr) @@ -6433,7 +6433,7 @@ } if (Error JumpFailed = Stream.JumpToBit(ModuleBit)) - return std::move(JumpFailed); + return JumpFailed; auto *R = new BitcodeReader(std::move(Stream), Strtab, ProducerIdentification, Context); @@ -6444,18 +6444,18 @@ // Delay parsing Metadata if ShouldLazyLoadMetadata is true. if (Error Err = R->parseBitcodeInto(M.get(), ShouldLazyLoadMetadata, IsImporting)) - return std::move(Err); + return Err; if (MaterializeAll) { // Read in the entire module, and destroy the BitcodeReader. if (Error Err = M->materializeAll()) - return std::move(Err); + return Err; } else { // Resolve forward references from blockaddresses. if (Error Err = R->materializeForwardReferencedFunctions()) - return std::move(Err); + return Err; } - return std::move(M); + return M; } Expected> @@ -6483,22 +6483,22 @@ Expected> BitcodeModule::getSummary() { BitstreamCursor Stream(Buffer); if (Error JumpFailed = Stream.JumpToBit(ModuleBit)) - return std::move(JumpFailed); + return JumpFailed; auto Index = llvm::make_unique(/*HaveGVs=*/false); ModuleSummaryIndexBitcodeReader R(std::move(Stream), Strtab, *Index, ModuleIdentifier, 0); if (Error Err = R.parseModule()) - return std::move(Err); + return Err; - return std::move(Index); + return Index; } static Expected getEnableSplitLTOUnitFlag(BitstreamCursor &Stream, unsigned ID) { if (Error Err = Stream.EnterSubBlock(ID)) - return std::move(Err); + return Err; SmallVector Record; while (true) { @@ -6544,10 +6544,10 @@ Expected BitcodeModule::getLTOInfo() { BitstreamCursor Stream(Buffer); if (Error JumpFailed = Stream.JumpToBit(ModuleBit)) - return std::move(JumpFailed); + return JumpFailed; if (Error Err = Stream.EnterSubBlock(bitc::MODULE_BLOCK_ID)) - return std::move(Err); + return Err; while (true) { Expected MaybeEntry = Stream.advance(); @@ -6583,7 +6583,7 @@ // Ignore other sub-blocks. if (Error Err = Stream.SkipBlock()) - return std::move(Err); + return Err; continue; case BitstreamEntry::Record: Index: llvm/lib/Bitcode/Reader/MetadataLoader.cpp =================================================================== --- llvm/lib/Bitcode/Reader/MetadataLoader.cpp +++ llvm/lib/Bitcode/Reader/MetadataLoader.cpp @@ -711,7 +711,7 @@ case bitc::METADATA_STRINGS: { // Rewind and parse the strings. if (Error Err = IndexCursor.JumpToBit(CurrentPos)) - return std::move(Err); + return Err; StringRef Blob; Record.clear(); if (Expected MaybeRecord = @@ -725,14 +725,14 @@ MDStringRef.push_back(Str); }; if (auto Err = parseMetadataStrings(Record, Blob, IndexNextMDString)) - return std::move(Err); + return Err; break; } case bitc::METADATA_INDEX_OFFSET: { // This is the offset to the index, when we see this we skip all the // records and load only an index to these. if (Error Err = IndexCursor.JumpToBit(CurrentPos)) - return std::move(Err); + return Err; Record.clear(); if (Expected MaybeRecord = IndexCursor.readRecord(Entry.ID, Record)) @@ -744,7 +744,7 @@ auto Offset = Record[0] + (Record[1] << 32); auto BeginPos = IndexCursor.GetCurrentBitNo(); if (Error Err = IndexCursor.JumpToBit(BeginPos + Offset)) - return std::move(Err); + return Err; Expected MaybeEntry = IndexCursor.advanceSkippingSubblocks( BitstreamCursor::AF_DontPopBlockAtEnd); @@ -778,7 +778,7 @@ case bitc::METADATA_NAME: { // Named metadata need to be materialized now and aren't deferred. if (Error Err = IndexCursor.JumpToBit(CurrentPos)) - return std::move(Err); + return Err; Record.clear(); unsigned Code; @@ -823,7 +823,7 @@ // FIXME: we need to do this early because we don't materialize global // value explicitly. if (Error Err = IndexCursor.JumpToBit(CurrentPos)) - return std::move(Err); + return Err; Record.clear(); if (Expected MaybeRecord = IndexCursor.readRecord(Entry.ID, Record)) @@ -838,7 +838,7 @@ if (auto *GO = dyn_cast(ValueList[ValueID])) if (Error Err = parseGlobalObjectAttachment( *GO, ArrayRef(Record).slice(1))) - return std::move(Err); + return Err; break; } case bitc::METADATA_KIND: Index: llvm/lib/Bitstream/Reader/BitstreamReader.cpp =================================================================== --- llvm/lib/Bitstream/Reader/BitstreamReader.cpp +++ llvm/lib/Bitstream/Reader/BitstreamReader.cpp @@ -164,7 +164,7 @@ if (Op.getEncoding() != BitCodeAbbrevOp::Array && Op.getEncoding() != BitCodeAbbrevOp::Blob) { if (Error Err = skipAbbreviatedField(*this, Op)) - return std::move(Err); + return Err; continue; } @@ -188,7 +188,7 @@ assert((unsigned)EltEnc.getEncodingData() <= MaxChunkSize); if (Error Err = JumpToBit(GetCurrentBitNo() + NumElts * EltEnc.getEncodingData())) - return std::move(Err); + return Err; break; case BitCodeAbbrevOp::VBR: assert((unsigned)EltEnc.getEncodingData() <= MaxChunkSize); @@ -201,7 +201,7 @@ break; case BitCodeAbbrevOp::Char6: if (Error Err = JumpToBit(GetCurrentBitNo() + NumElts * 6)) - return std::move(Err); + return Err; break; } continue; @@ -227,7 +227,7 @@ // Skip over the blob. if (Error Err = JumpToBit(NewEnd)) - return std::move(Err); + return Err; } return Code; } @@ -356,7 +356,7 @@ // over tail padding first, in case jumping to NewEnd invalidates the Blob // pointer. if (Error Err = JumpToBit(NewEnd)) - return std::move(Err); + return Err; const char *Ptr = (const char *)getPointerToBit(CurBitPos, NumElts); // If we can return a reference to the data, do so to avoid copying it. @@ -431,7 +431,7 @@ Expected> BitstreamCursor::ReadBlockInfoBlock(bool ReadBlockInfoNames) { if (llvm::Error Err = EnterSubBlock(bitc::BLOCKINFO_BLOCK_ID)) - return std::move(Err); + return Err; BitstreamBlockInfo NewBlockInfo; @@ -451,7 +451,7 @@ case llvm::BitstreamEntry::Error: return None; case llvm::BitstreamEntry::EndBlock: - return std::move(NewBlockInfo); + return NewBlockInfo; case llvm::BitstreamEntry::Record: // The interesting case. break; @@ -461,7 +461,7 @@ if (Entry.ID == bitc::DEFINE_ABBREV) { if (!CurBlockInfo) return None; if (Error Err = ReadAbbrevRecord()) - return std::move(Err); + return Err; // ReadAbbrevRecord installs the abbrev in CurAbbrevs. Move it to the // appropriate BlockInfo. Index: llvm/lib/DebugInfo/CodeView/DebugStringTableSubsection.cpp =================================================================== --- llvm/lib/DebugInfo/CodeView/DebugStringTableSubsection.cpp +++ llvm/lib/DebugInfo/CodeView/DebugStringTableSubsection.cpp @@ -37,7 +37,7 @@ Reader.setOffset(Offset); StringRef Result; if (auto EC = Reader.readCString(Result)) - return std::move(EC); + return EC; return Result; } Index: llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp =================================================================== --- llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp +++ llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp @@ -456,7 +456,7 @@ if (!AttrEncOr) return AttrEncOr.takeError(); if (isSentinel(*AttrEncOr)) - return std::move(Result); + return Result; Result.emplace_back(*AttrEncOr); } @@ -619,7 +619,7 @@ return createStringError(errc::io_error, "Error extracting index attribute values."); } - return std::move(E); + return E; } DWARFDebugNames::NameTableEntry Index: llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp =================================================================== --- llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp +++ llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp @@ -523,7 +523,7 @@ if (Pos.second) { if (Error Err = LT->parse(DebugLineData, &Offset, Ctx, U, RecoverableErrorCallback)) - return std::move(Err); + return Err; return LT; } return LT; Index: llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp =================================================================== --- llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp +++ llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp @@ -319,7 +319,7 @@ } llvm::DWARFDebugRnglistTable Table; if (Error E = Table.extractHeaderAndOffsets(DA, &Offset)) - return std::move(E); + return E; return Table; } @@ -545,7 +545,7 @@ if (getVersion() <= 4) { DWARFDebugRangeList RangeList; if (Error E = extractRangeList(Offset, RangeList)) - return std::move(E); + return E; return RangeList.getAbsoluteRanges(getBaseAddress()); } if (RngListTable) { Index: llvm/lib/DebugInfo/MSF/MSFBuilder.cpp =================================================================== --- llvm/lib/DebugInfo/MSF/MSFBuilder.cpp +++ llvm/lib/DebugInfo/MSF/MSFBuilder.cpp @@ -183,7 +183,7 @@ std::vector NewBlocks; NewBlocks.resize(ReqBlocks); if (auto EC = allocateBlocks(ReqBlocks, NewBlocks)) - return std::move(EC); + return EC; StreamData.push_back(std::make_pair(Size, NewBlocks)); return StreamData.size() - 1; } @@ -267,7 +267,7 @@ uint32_t NumExtraBlocks = NumDirectoryBlocks - DirectoryBlocks.size(); ExtraBlocks.resize(NumExtraBlocks); if (auto EC = allocateBlocks(NumExtraBlocks, ExtraBlocks)) - return std::move(EC); + return EC; DirectoryBlocks.insert(DirectoryBlocks.end(), ExtraBlocks.begin(), ExtraBlocks.end()); } else if (NumDirectoryBlocks < DirectoryBlocks.size()) { @@ -346,14 +346,14 @@ uint64_t FileSize = Layout.SB->BlockSize * Layout.SB->NumBlocks; auto OutFileOrError = FileOutputBuffer::create(Path, FileSize); if (auto EC = OutFileOrError.takeError()) - return std::move(EC); + return EC; FileBufferByteStream Buffer(std::move(*OutFileOrError), llvm::support::little); BinaryStreamWriter Writer(Buffer); if (auto EC = Writer.writeObject(*Layout.SB)) - return std::move(EC); + return EC; commitFpm(Buffer, Layout, Allocator); @@ -361,21 +361,21 @@ msf::blockToOffset(Layout.SB->BlockMapAddr, Layout.SB->BlockSize); Writer.setOffset(BlockMapOffset); if (auto EC = Writer.writeArray(Layout.DirectoryBlocks)) - return std::move(EC); + return EC; auto DirStream = WritableMappedBlockStream::createDirectoryStream( Layout, Buffer, Allocator); BinaryStreamWriter DW(*DirStream); if (auto EC = DW.writeInteger(Layout.StreamSizes.size())) - return std::move(EC); + return EC; if (auto EC = DW.writeArray(Layout.StreamSizes)) - return std::move(EC); + return EC; for (const auto &Blocks : Layout.StreamMap) { if (auto EC = DW.writeArray(Blocks)) - return std::move(EC); + return EC; } - return std::move(Buffer); + return Buffer; } Index: llvm/lib/DebugInfo/PDB/Native/DbiModuleList.cpp =================================================================== --- llvm/lib/DebugInfo/PDB/Native/DbiModuleList.cpp +++ llvm/lib/DebugInfo/PDB/Native/DbiModuleList.cpp @@ -274,6 +274,6 @@ Names.setOffset(FileOffset); StringRef Name; if (auto EC = Names.readCString(Name)) - return std::move(EC); + return EC; return Name; } Index: llvm/lib/DebugInfo/PDB/Native/ModuleDebugStream.cpp =================================================================== --- llvm/lib/DebugInfo/PDB/Native/ModuleDebugStream.cpp +++ llvm/lib/DebugInfo/PDB/Native/ModuleDebugStream.cpp @@ -137,7 +137,7 @@ continue; if (auto EC = Result.initialize(SS.getRecordData())) - return std::move(EC); + return EC; return Result; } return Result; Index: llvm/lib/DebugInfo/PDB/Native/NativeEnumInjectedSources.cpp =================================================================== --- llvm/lib/DebugInfo/PDB/Native/NativeEnumInjectedSources.cpp +++ llvm/lib/DebugInfo/PDB/Native/NativeEnumInjectedSources.cpp @@ -24,7 +24,7 @@ while (Offset < DataLength) { ArrayRef Data; if (auto E = Stream.readLongestContiguousChunk(Offset, Data)) - return std::move(E); + return E; Data = Data.take_front(DataLength - Offset); Offset += Data.size(); Result += toStringRef(Data); Index: llvm/lib/DebugInfo/PDB/Native/PDBFile.cpp =================================================================== --- llvm/lib/DebugInfo/PDB/Native/PDBFile.cpp +++ llvm/lib/DebugInfo/PDB/Native/PDBFile.cpp @@ -107,7 +107,7 @@ ArrayRef Result; if (auto EC = Buffer->readBytes(StreamBlockOffset, NumBytes, Result)) - return std::move(EC); + return EC; return Result; } @@ -266,7 +266,7 @@ return GlobalS.takeError(); auto TempGlobals = llvm::make_unique(std::move(*GlobalS)); if (auto EC = TempGlobals->reload()) - return std::move(EC); + return EC; Globals = std::move(TempGlobals); } return *Globals; @@ -279,7 +279,7 @@ return InfoS.takeError(); auto TempInfo = llvm::make_unique(std::move(*InfoS)); if (auto EC = TempInfo->reload()) - return std::move(EC); + return EC; Info = std::move(TempInfo); } return *Info; @@ -292,7 +292,7 @@ return DbiS.takeError(); auto TempDbi = llvm::make_unique(std::move(*DbiS)); if (auto EC = TempDbi->reload(this)) - return std::move(EC); + return EC; Dbi = std::move(TempDbi); } return *Dbi; @@ -305,7 +305,7 @@ return TpiS.takeError(); auto TempTpi = llvm::make_unique(*this, std::move(*TpiS)); if (auto EC = TempTpi->reload()) - return std::move(EC); + return EC; Tpi = std::move(TempTpi); } return *Tpi; @@ -321,7 +321,7 @@ return IpiS.takeError(); auto TempIpi = llvm::make_unique(*this, std::move(*IpiS)); if (auto EC = TempIpi->reload()) - return std::move(EC); + return EC; Ipi = std::move(TempIpi); } return *Ipi; @@ -339,7 +339,7 @@ return PublicS.takeError(); auto TempPublics = llvm::make_unique(std::move(*PublicS)); if (auto EC = TempPublics->reload()) - return std::move(EC); + return EC; Publics = std::move(TempPublics); } return *Publics; @@ -358,7 +358,7 @@ auto TempSymbols = llvm::make_unique(std::move(*SymbolS)); if (auto EC = TempSymbols->reload()) - return std::move(EC); + return EC; Symbols = std::move(TempSymbols); } return *Symbols; @@ -373,7 +373,7 @@ auto N = llvm::make_unique(); BinaryStreamReader Reader(**NS); if (auto EC = N->reload(Reader)) - return std::move(EC); + return EC; assert(Reader.bytesRemaining() == 0); StringTableStream = std::move(*NS); Strings = std::move(N); @@ -393,7 +393,7 @@ auto IJ = llvm::make_unique(std::move(*IJS)); if (auto EC = IJ->reload(*Strings)) - return std::move(EC); + return EC; InjectedSources = std::move(IJ); } return *InjectedSources; Index: llvm/lib/DebugInfo/PDB/Native/TpiHashing.cpp =================================================================== --- llvm/lib/DebugInfo/PDB/Native/TpiHashing.cpp +++ llvm/lib/DebugInfo/PDB/Native/TpiHashing.cpp @@ -44,7 +44,7 @@ T Deserialized; if (auto E = TypeDeserializer::deserializeAs(const_cast(Rec), Deserialized)) - return std::move(E); + return E; return getHashForUdt(Deserialized, Rec.data()); } @@ -53,7 +53,7 @@ T Deserialized; if (auto E = TypeDeserializer::deserializeAs(const_cast(Rec), Deserialized)) - return std::move(E); + return E; ClassOptions Opts = Deserialized.getOptions(); @@ -79,7 +79,7 @@ T Deserialized; if (auto E = TypeDeserializer::deserializeAs(const_cast(Rec), Deserialized)) - return std::move(E); + return E; char Buf[4]; support::endian::write32le(Buf, Deserialized.getUDT().getIndex()); return hashStringV1(StringRef(Buf, 4)); Index: llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp =================================================================== --- llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp +++ llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp @@ -99,7 +99,7 @@ Uniquify(Fs); Uniquify(Os); - return std::move(res); + return res; } SymbolizableObjectFile::SymbolizableObjectFile(const ObjectFile *Obj, Index: llvm/lib/ExecutionEngine/JITLink/EHFrameSupport.cpp =================================================================== --- llvm/lib/ExecutionEngine/JITLink/EHFrameSupport.cpp +++ llvm/lib/ExecutionEngine/JITLink/EHFrameSupport.cpp @@ -105,7 +105,7 @@ uint8_t *NextField = &AugInfo.Fields[0]; if (auto Err = EHFrameReader.readInteger(NextChar)) - return std::move(Err); + return Err; while (NextChar != 0) { switch (NextChar) { @@ -114,7 +114,7 @@ break; case 'e': if (auto Err = EHFrameReader.readInteger(NextChar)) - return std::move(Err); + return Err; if (NextChar != 'h') return make_error("Unrecognized substring e" + Twine(NextChar) + @@ -133,10 +133,10 @@ } if (auto Err = EHFrameReader.readInteger(NextChar)) - return std::move(Err); + return Err; } - return std::move(AugInfo); + return AugInfo; } Expected EHFrameParser::readAbsolutePointer() { @@ -145,11 +145,11 @@ JITTargetAddress Addr; if (G.getPointerSize() == 8) { if (auto Err = EHFrameReader.readInteger(Addr)) - return std::move(Err); + return Err; } else if (G.getPointerSize() == 4) { uint32_t Addr32; if (auto Err = EHFrameReader.readInteger(Addr32)) - return std::move(Err); + return Err; Addr = Addr32; } else llvm_unreachable("Pointer size is not 32-bit or 64-bit"); Index: llvm/lib/ExecutionEngine/JITLink/MachOAtomGraphBuilder.cpp =================================================================== --- llvm/lib/ExecutionEngine/JITLink/MachOAtomGraphBuilder.cpp +++ llvm/lib/ExecutionEngine/JITLink/MachOAtomGraphBuilder.cpp @@ -21,13 +21,13 @@ Expected> MachOAtomGraphBuilder::buildGraph() { if (auto Err = parseSections()) - return std::move(Err); + return Err; if (auto Err = addAtoms()) - return std::move(Err); + return Err; if (auto Err = addRelocations()) - return std::move(Err); + return Err; return std::move(G); } Index: llvm/lib/ExecutionEngine/Orc/CompileOnDemandLayer.cpp =================================================================== --- llvm/lib/ExecutionEngine/Orc/CompileOnDemandLayer.cpp +++ llvm/lib/ExecutionEngine/Orc/CompileOnDemandLayer.cpp @@ -100,7 +100,7 @@ Optional CompileOnDemandLayer::compileRequested(GlobalValueSet Requested) { - return std::move(Requested); + return Requested; } Optional @@ -290,7 +290,7 @@ SymbolFlags[Mangle(GV->getName())] = JITSymbolFlags::fromGlobalValue(*GV); if (auto Err = R.defineMaterializing(SymbolFlags)) - return std::move(Err); + return Err; } expandPartition(*GVsToExtract); Index: llvm/lib/ExecutionEngine/Orc/CompileUtils.cpp =================================================================== --- llvm/lib/ExecutionEngine/Orc/CompileUtils.cpp +++ llvm/lib/ExecutionEngine/Orc/CompileUtils.cpp @@ -50,7 +50,7 @@ if (Obj) { notifyObjectCompiled(M, *ObjBuffer); - return std::move(ObjBuffer); + return ObjBuffer; } // TODO: Actually report errors helpfully. Index: llvm/lib/ExecutionEngine/Orc/Core.cpp =================================================================== --- llvm/lib/ExecutionEngine/Orc/Core.cpp +++ llvm/lib/ExecutionEngine/Orc/Core.cpp @@ -1309,7 +1309,7 @@ }); if (Err) - return std::move(Err); + return Err; assert((MUs.empty() || !QueryComplete) && "If action flags are set, there should be no work to do (so no MUs)"); @@ -1681,8 +1681,8 @@ auto ResultFuture = PromisedResult.get_future(); auto Result = ResultFuture.get(); if (ResolutionError) - return std::move(ResolutionError); - return std::move(Result); + return ResolutionError; + return Result; #else if (ResolutionError) @@ -1825,9 +1825,9 @@ auto Result = ResultFuture.get(); if (ResolutionError) - return std::move(ResolutionError); + return ResolutionError; - return std::move(Result); + return Result; #else if (ResolutionError) Index: llvm/lib/ExecutionEngine/Orc/OrcCBindingsStack.h =================================================================== --- llvm/lib/ExecutionEngine/Orc/OrcCBindingsStack.h +++ llvm/lib/ExecutionEngine/Orc/OrcCBindingsStack.h @@ -305,7 +305,7 @@ Resolvers[K] = std::make_shared(*this, ExternalResolver, ExternalResolverCtx); if (auto Err = Layer.addModule(K, std::move(M))) - return std::move(Err); + return Err; KeyLayers[K] = detail::createGenericLayer(Layer); @@ -314,7 +314,7 @@ orc::LegacyCtorDtorRunner CtorRunner( AcknowledgeORCv1Deprecation, std::move(CtorNames), K); if (auto Err = CtorRunner.runViaLayer(*this)) - return std::move(Err); + return Err; IRStaticDestructorRunners.emplace_back(AcknowledgeORCv1Deprecation, std::move(DtorNames), K); @@ -365,7 +365,7 @@ *this, ExternalResolver, ExternalResolverCtx); if (auto Err = ObjectLayer.addObject(K, std::move(ObjBuffer))) - return std::move(Err); + return Err; KeyLayers[K] = detail::createGenericLayer(ObjectLayer); @@ -399,7 +399,7 @@ return AddrOrErr.takeError(); } else if (auto Err = Sym.takeError()) { // Lookup failure - report error. - return std::move(Err); + return Err; } // No symbol not found. Return 0. @@ -417,7 +417,7 @@ return AddrOrErr.takeError(); } else if (auto Err = Sym.takeError()) { // Lookup failure - report error. - return std::move(Err); + return Err; } // Symbol not found. Return 0. Index: llvm/lib/ExecutionEngine/RuntimeDyld/JITSymbol.cpp =================================================================== --- llvm/lib/ExecutionEngine/RuntimeDyld/JITSymbol.cpp +++ llvm/lib/ExecutionEngine/RuntimeDyld/JITSymbol.cpp @@ -119,7 +119,7 @@ if (!Sym.getFlags().isStrong()) Result.insert(Symbol); } else if (auto Err = Sym.takeError()) - return std::move(Err); + return Err; else { // If there is no existing definition then the caller is responsible for // it. @@ -127,5 +127,5 @@ } } - return std::move(Result); + return Result; } Index: llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp =================================================================== --- llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp +++ llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp @@ -193,7 +193,7 @@ CodeSize, CodeAlign, RODataSize, RODataAlign, RWDataSize, RWDataAlign)) - return std::move(Err); + return Err; MemMgr.reserveAllocationSpace(CodeSize, CodeAlign, RODataSize, RODataAlign, RWDataSize, RWDataAlign); } @@ -318,7 +318,7 @@ // Get symbol offset. uint64_t SectOffset; if (auto Err = getOffset(*I, *SI, SectOffset)) - return std::move(Err); + return Err; bool IsCode = SI->isText(); unsigned SectionID; @@ -340,7 +340,7 @@ // Allocate common symbols if (auto Err = emitCommonSymbols(Obj, CommonSymbolsToAllocate, CommonSize, CommonAlign)) - return std::move(Err); + return Err; // Parse and process relocations LLVM_DEBUG(dbgs() << "Parse relocations:\n"); @@ -427,7 +427,7 @@ // Give the subclasses a chance to tie-up any loose ends. if (auto Err = finalizeLoad(Obj, LocalSections)) - return std::move(Err); + return Err; // for (auto E : LocalSections) // llvm::dbgs() << "Added: " << E.first.getRawDataRefImpl() << " -> " << E.second << "\n"; Index: llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp =================================================================== --- llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp +++ llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp @@ -102,10 +102,10 @@ DyldELFObject::create(MemoryBufferRef Wrapper) { auto Obj = ELFObjectFile::create(Wrapper); if (auto E = Obj.takeError()) - return std::move(E); + return E; std::unique_ptr> Ret( new DyldELFObject(std::move(*Obj))); - return std::move(Ret); + return Ret; } template @@ -153,7 +153,7 @@ Expected>> ObjOrErr = DyldELFObject::create(Buffer); if (Error E = ObjOrErr.takeError()) - return std::move(E); + return E; std::unique_ptr> Obj = std::move(*ObjOrErr); @@ -176,7 +176,7 @@ ++SI; } - return std::move(Obj); + return Obj; } static OwningBinary @@ -1449,7 +1449,7 @@ // so the final symbol value is calculated based on the relocation // values in the .opd section. if (auto Err = findOPDEntrySection(Obj, ObjSectionToID, Value)) - return std::move(Err); + return Err; } else { // In the ELFv2 ABI, a function symbol may provide a local entry // point, which must be used for direct calls. @@ -1563,7 +1563,7 @@ RelocationValueRef TOCValue; if (auto Err = findPPC64TOCSection(Obj, ObjSectionToID, TOCValue)) - return std::move(Err); + return Err; if (Value.SymbolName || Value.SectionID != TOCValue.SectionID) llvm_unreachable("Unsupported TOC relocation."); Value.Addend -= TOCValue.Addend; @@ -1576,10 +1576,10 @@ if (RelType == ELF::R_PPC64_TOC) { RelType = ELF::R_PPC64_ADDR64; if (auto Err = findPPC64TOCSection(Obj, ObjSectionToID, Value)) - return std::move(Err); + return Err; } else if (TargetName == ".TOC.") { if (auto Err = findPPC64TOCSection(Obj, ObjSectionToID, Value)) - return std::move(Err); + return Err; Value.Addend += Addend; } Index: llvm/lib/IR/RemarkStreamer.cpp =================================================================== --- llvm/lib/IR/RemarkStreamer.cpp +++ llvm/lib/IR/RemarkStreamer.cpp @@ -148,5 +148,5 @@ if (Error E = Context.getRemarkStreamer()->setFilter(RemarksPasses)) return make_error(std::move(E)); - return std::move(RemarksFile); + return RemarksFile; } Index: llvm/lib/LTO/LTO.cpp =================================================================== --- llvm/lib/LTO/LTO.cpp +++ llvm/lib/LTO/LTO.cpp @@ -445,7 +445,7 @@ File->Mods = FOrErr->Mods; File->Strtab = std::move(FOrErr->Strtab); - return std::move(File); + return File; } StringRef InputFile::getName() const { @@ -665,7 +665,7 @@ Mod.M = std::move(*MOrErr); if (Error Err = M.materializeMetadata()) - return std::move(Err); + return Err; UpgradeDebugInfo(M); ModuleSymbolTable SymTab; @@ -764,7 +764,7 @@ for (GlobalValue &GV : M.global_values()) handleNonPrevailingComdat(GV, NonPrevailingComdats); assert(MsymI == MsymE); - return std::move(Mod); + return Mod; } Error LTO::linkRegularLTO(RegularLTOState::AddedModule Mod, @@ -1365,7 +1365,7 @@ auto ResultOrErr = llvm::setupOptimizationRemarks( Context, Filename, RemarksPasses, RemarksFormat, RemarksWithHotness); if (Error E = ResultOrErr.takeError()) - return std::move(E); + return E; if (*ResultOrErr) (*ResultOrErr)->keep(); @@ -1387,5 +1387,5 @@ return errorCodeToError(EC); StatsFile->keep(); - return std::move(StatsFile); + return StatsFile; } Index: llvm/lib/LTO/LTOModule.cpp =================================================================== --- llvm/lib/LTO/LTOModule.cpp +++ llvm/lib/LTO/LTOModule.cpp @@ -231,7 +231,7 @@ Ret->parseSymbols(); Ret->parseMetadata(); - return std::move(Ret); + return Ret; } /// Create a MemoryBuffer from a memory range with an optional name. Index: llvm/lib/MCA/InstrBuilder.cpp =================================================================== --- llvm/lib/MCA/InstrBuilder.cpp +++ llvm/lib/MCA/InstrBuilder.cpp @@ -579,7 +579,7 @@ computeMaxLatency(*ID, MCDesc, SCDesc, STI); if (Error Err = verifyOperands(MCDesc, MCI)) - return std::move(Err); + return Err; populateWrites(*ID, MCI, SchedClassID); populateReads(*ID, MCI, SchedClassID); @@ -589,7 +589,7 @@ // Sanity check on the instruction descriptor. if (Error Err = verifyInstrDesc(*ID, MCI)) - return std::move(Err); + return Err; // Now add the new descriptor. bool IsVariadic = MCDesc.isVariadic(); @@ -682,7 +682,7 @@ // Early exit if there are no writes. if (D.Writes.empty()) - return std::move(NewIS); + return NewIS; // Track register writes that implicitly clear the upper portion of the // underlying super-registers using an APInt. @@ -711,7 +711,7 @@ ++WriteIndex; } - return std::move(NewIS); + return NewIS; } } // namespace mca } // namespace llvm Index: llvm/lib/MCA/Pipeline.cpp =================================================================== --- llvm/lib/MCA/Pipeline.cpp +++ llvm/lib/MCA/Pipeline.cpp @@ -40,7 +40,7 @@ do { notifyCycleBegin(); if (Error Err = runCycle()) - return std::move(Err); + return Err; notifyCycleEnd(); ++Cycles; } while (hasWorkToProcess()); Index: llvm/lib/Object/Archive.cpp =================================================================== --- llvm/lib/Object/Archive.cpp +++ llvm/lib/Object/Archive.cpp @@ -481,7 +481,7 @@ Error Err = Error::success(); Child Ret(Parent, NextLoc, &Err); if (Err) - return std::move(Err); + return Err; return Ret; } @@ -531,8 +531,8 @@ Error Err = Error::success(); std::unique_ptr Ret(new Archive(Source, Err)); if (Err) - return std::move(Err); - return std::move(Ret); + return Err; + return Ret; } void Archive::setFirstRegular(const Child &C) { @@ -852,7 +852,7 @@ Error Err = Error::success(); Child C(Parent, Loc, &Err); if (Err) - return std::move(Err); + return Err; return C; } Index: llvm/lib/Object/ArchiveWriter.cpp =================================================================== --- llvm/lib/Object/ArchiveWriter.cpp +++ llvm/lib/Object/ArchiveWriter.cpp @@ -69,7 +69,7 @@ return AccessModeOrErr.takeError(); M.Perms = AccessModeOrErr.get(); } - return std::move(M); + return M; } Expected NewArchiveMember::getFile(StringRef FileName, @@ -108,7 +108,7 @@ M.GID = Status.getGroup(); M.Perms = Status.permissions(); } - return std::move(M); + return M; } template @@ -378,7 +378,7 @@ continue; Ret.push_back(SymNames.tell()); if (Error E = S.printName(SymNames)) - return std::move(E); + return E; SymNames << '\0'; } return Ret; @@ -490,7 +490,7 @@ Expected> Symbols = getSymbols(Buf, SymNames, HasObject); if (auto E = Symbols.takeError()) - return std::move(E); + return E; Pos += Header.size() + Data.size() + Padding.size(); Ret.push_back({std::move(*Symbols), std::move(Header), Data, Padding}); Index: llvm/lib/Object/COFFModuleDefinition.cpp =================================================================== --- llvm/lib/Object/COFFModuleDefinition.cpp +++ llvm/lib/Object/COFFModuleDefinition.cpp @@ -151,7 +151,7 @@ Expected parse() { do { if (Error Err = parseOne()) - return std::move(Err); + return Err; } while (Tok.K != Eof); return Info; } Index: llvm/lib/Object/COFFObjectFile.cpp =================================================================== --- llvm/lib/Object/COFFObjectFile.cpp +++ llvm/lib/Object/COFFObjectFile.cpp @@ -297,7 +297,7 @@ const coff_section *Sec = toSec(Ref); ArrayRef Res; if (Error E = getSectionContents(Sec, Res)) - return std::move(E); + return E; return Res; } @@ -1647,7 +1647,7 @@ std::unique_ptr Ret(new COFFObjectFile(Object, EC)); if (EC) return errorCodeToError(EC); - return std::move(Ret); + return Ret; } bool BaseRelocRef::operator==(const BaseRelocRef &Other) const { Index: llvm/lib/Object/Decompressor.cpp =================================================================== --- llvm/lib/Object/Decompressor.cpp +++ llvm/lib/Object/Decompressor.cpp @@ -26,7 +26,7 @@ Error Err = isGnuStyle(Name) ? D.consumeCompressedGnuHeader() : D.consumeCompressedZLibHeader(Is64Bit, IsLE); if (Err) - return std::move(Err); + return Err; return D; } Index: llvm/lib/Object/ELFObjectFile.cpp =================================================================== --- llvm/lib/Object/ELFObjectFile.cpp +++ llvm/lib/Object/ELFObjectFile.cpp @@ -53,7 +53,7 @@ createPtr(MemoryBufferRef Object) { auto Ret = ELFObjectFile::create(Object); if (Error E = Ret.takeError()) - return std::move(E); + return E; return make_unique>(std::move(*Ret)); } Index: llvm/lib/Object/IRObjectFile.cpp =================================================================== --- llvm/lib/Object/IRObjectFile.cpp +++ llvm/lib/Object/IRObjectFile.cpp @@ -151,5 +151,5 @@ F.Symtab = std::move(FCOrErr->Symtab); F.Strtab = std::move(FCOrErr->Strtab); F.TheReader = std::move(FCOrErr->TheReader); - return std::move(F); + return F; } Index: llvm/lib/Object/IRSymtab.cpp =================================================================== --- llvm/lib/Object/IRSymtab.cpp +++ llvm/lib/Object/IRSymtab.cpp @@ -363,7 +363,7 @@ StringTableBuilder StrtabBuilder(StringTableBuilder::RAW); BumpPtrAllocator Alloc; if (Error E = build(Mods, FC.Symtab, StrtabBuilder, Alloc)) - return std::move(E); + return E; StrtabBuilder.finalizeInOrder(); FC.Strtab.resize(StrtabBuilder.getSize()); @@ -371,7 +371,7 @@ FC.TheReader = {{FC.Symtab.data(), FC.Symtab.size()}, {FC.Strtab.data(), FC.Strtab.size()}}; - return std::move(FC); + return FC; } Expected irsymtab::readBitcode(const BitcodeFileContents &BFC) { @@ -405,5 +405,5 @@ if (FC.TheReader.getNumModules() != BFC.Mods.size()) return upgrade(std::move(BFC.Mods)); - return std::move(FC); + return FC; } Index: llvm/lib/Object/MachOObjectFile.cpp =================================================================== --- llvm/lib/Object/MachOObjectFile.cpp +++ llvm/lib/Object/MachOObjectFile.cpp @@ -1247,8 +1247,8 @@ Is64Bits, Err, UniversalCputype, UniversalIndex)); if (Err) - return std::move(Err); - return std::move(Obj); + return Err; + return Obj; } MachOObjectFile::MachOObjectFile(MemoryBufferRef Object, bool IsLittleEndian, Index: llvm/lib/Object/MachOUniversal.cpp =================================================================== --- llvm/lib/Object/MachOUniversal.cpp +++ llvm/lib/Object/MachOUniversal.cpp @@ -105,8 +105,8 @@ std::unique_ptr Ret( new MachOUniversalBinary(Source, Err)); if (Err) - return std::move(Err); - return std::move(Ret); + return Err; + return Ret; } MachOUniversalBinary::MachOUniversalBinary(MemoryBufferRef Source, Error &Err) Index: llvm/lib/Object/ObjectFile.cpp =================================================================== --- llvm/lib/Object/ObjectFile.cpp +++ llvm/lib/Object/ObjectFile.cpp @@ -170,7 +170,7 @@ Expected> ObjOrErr = createObjectFile(Buffer->getMemBufferRef()); if (Error Err = ObjOrErr.takeError()) - return std::move(Err); + return Err; std::unique_ptr Obj = std::move(ObjOrErr.get()); return OwningBinary(std::move(Obj), std::move(Buffer)); Index: llvm/lib/Object/SymbolicFile.cpp =================================================================== --- llvm/lib/Object/SymbolicFile.cpp +++ llvm/lib/Object/SymbolicFile.cpp @@ -81,13 +81,13 @@ Expected> Obj = ObjectFile::createObjectFile(Object, Type); if (!Obj || !Context) - return std::move(Obj); + return Obj; Expected BCData = IRObjectFile::findBitcodeInObject(*Obj->get()); if (!BCData) { consumeError(BCData.takeError()); - return std::move(Obj); + return Obj; } return IRObjectFile::create( Index: llvm/lib/Object/WasmObjectFile.cpp =================================================================== --- llvm/lib/Object/WasmObjectFile.cpp +++ llvm/lib/Object/WasmObjectFile.cpp @@ -58,9 +58,9 @@ Error Err = Error::success(); auto ObjectFile = llvm::make_unique(Buffer, Err); if (Err) - return std::move(Err); + return Err; - return std::move(ObjectFile); + return ObjectFile; } #define VARINT7_MAX ((1 << 7) - 1) Index: llvm/lib/Object/WindowsResource.cpp =================================================================== --- llvm/lib/Object/WindowsResource.cpp +++ llvm/lib/Object/WindowsResource.cpp @@ -54,7 +54,7 @@ Source.getBufferIdentifier() + ": too small to be a resource file", object_error::invalid_file_type); std::unique_ptr Ret(new WindowsResource(Source)); - return std::move(Ret); + return Ret; } Expected WindowsResource::getHeadEntry() { @@ -72,7 +72,7 @@ ResourceEntryRef::create(BinaryStreamRef BSR, const WindowsResource *Owner) { auto Ref = ResourceEntryRef(BSR, Owner); if (auto E = Ref.loadNext()) - return std::move(E); + return E; return Ref; } @@ -795,7 +795,7 @@ Error E = Error::success(); WindowsResourceCOFFWriter Writer(MachineType, Parser, E); if (E) - return std::move(E); + return E; return Writer.write(TimeDateStamp); } Index: llvm/lib/Object/XCOFFObjectFile.cpp =================================================================== --- llvm/lib/Object/XCOFFObjectFile.cpp +++ llvm/lib/Object/XCOFFObjectFile.cpp @@ -491,7 +491,7 @@ auto StringTableOrErr = getObject(Obj->Data, Obj->base() + Offset, Size); if (Error E = StringTableOrErr.takeError()) - return std::move(E); + return E; const char *StringTablePtr = StringTableOrErr.get(); if (StringTablePtr[Size - 1] != '\0') @@ -514,7 +514,7 @@ auto FileHeaderOrErr = getObject(Data, Base + CurOffset, Obj->getFileHeaderSize()); if (Error E = FileHeaderOrErr.takeError()) - return std::move(E); + return E; Obj->FileHeader = FileHeaderOrErr.get(); CurOffset += Obj->getFileHeaderSize(); @@ -528,17 +528,17 @@ Obj->getNumberOfSections() * Obj->getSectionHeaderSize()); if (Error E = SecHeadersOrErr.takeError()) - return std::move(E); + return E; Obj->SectionHeaderTable = SecHeadersOrErr.get(); } // 64-bit object supports only file header and section headers for now. if (Obj->is64Bit()) - return std::move(Obj); + return Obj; // If there is no symbol table we are done parsing the memory buffer. if (Obj->getLogicalNumberOfSymbolTableEntries32() == 0) - return std::move(Obj); + return Obj; // Parse symbol table. CurOffset = Obj->fileHeader32()->SymbolTableOffset; @@ -547,7 +547,7 @@ auto SymTableOrErr = getObject(Data, Base + CurOffset, SymbolTableSize); if (Error E = SymTableOrErr.takeError()) - return std::move(E); + return E; Obj->SymbolTblPtr = SymTableOrErr.get(); CurOffset += SymbolTableSize; @@ -555,10 +555,10 @@ Expected StringTableOrErr = parseStringTable(Obj.get(), CurOffset); if (Error E = StringTableOrErr.takeError()) - return std::move(E); + return E; Obj->StringTable = StringTableOrErr.get(); - return std::move(Obj); + return Obj; } Expected> Index: llvm/lib/ObjectYAML/CodeViewYAMLDebugSections.cpp =================================================================== --- llvm/lib/ObjectYAML/CodeViewYAMLDebugSections.cpp +++ llvm/lib/ObjectYAML/CodeViewYAMLDebugSections.cpp @@ -694,11 +694,11 @@ StringRef S; // First item is a single null string, skip it. if (auto EC = Reader.readCString(S)) - return std::move(EC); + return EC; assert(S.empty()); while (Reader.bytesRemaining() > 0) { if (auto EC = Reader.readCString(S)) - return std::move(EC); + return EC; Result->Strings.push_back(S); } return Result; @@ -749,7 +749,7 @@ const codeview::StringsAndChecksums &SC) { std::vector> Result; if (Subsections.empty()) - return std::move(Result); + return Result; for (const auto &SS : Subsections) { std::shared_ptr CVS; @@ -757,7 +757,7 @@ assert(CVS != nullptr); Result.push_back(std::move(CVS)); } - return std::move(Result); + return Result; } namespace { @@ -892,7 +892,7 @@ const DebugSubsectionRecord &SS) { SubsectionConversionVisitor V; if (auto EC = visitDebugSubsection(SS, V, SC)) - return std::move(EC); + return EC; return V.Subsection; } Index: llvm/lib/ObjectYAML/CodeViewYAMLSymbols.cpp =================================================================== --- llvm/lib/ObjectYAML/CodeViewYAMLSymbols.cpp +++ llvm/lib/ObjectYAML/CodeViewYAMLSymbols.cpp @@ -585,7 +585,7 @@ auto Impl = std::make_shared(Symbol.kind()); if (auto EC = Impl->fromCodeViewSymbol(Symbol)) - return std::move(EC); + return EC; Result.Symbol = Impl; return Result; } Index: llvm/lib/ObjectYAML/CodeViewYAMLTypes.cpp =================================================================== --- llvm/lib/ObjectYAML/CodeViewYAMLTypes.cpp +++ llvm/lib/ObjectYAML/CodeViewYAMLTypes.cpp @@ -671,7 +671,7 @@ auto Impl = std::make_shared>(Type.kind()); if (auto EC = Impl->fromCodeViewRecord(Type)) - return std::move(EC); + return EC; Result.Leaf = Impl; return Result; } Index: llvm/lib/ObjectYAML/DWARFEmitter.cpp =================================================================== --- llvm/lib/ObjectYAML/DWARFEmitter.cpp +++ llvm/lib/ObjectYAML/DWARFEmitter.cpp @@ -374,5 +374,5 @@ DebugSections); EmitDebugSectionImpl(DI, &DWARFYAML::EmitDebugAranges, "debug_aranges", DebugSections); - return std::move(DebugSections); + return DebugSections; } Index: llvm/lib/Passes/PassBuilder.cpp =================================================================== --- llvm/lib/Passes/PassBuilder.cpp +++ llvm/lib/Passes/PassBuilder.cpp @@ -1433,7 +1433,7 @@ Expected Result = Parser(Params); assert((Result || Result.template errorIsA()) && "Pass parameter parser can only return StringErrors."); - return std::move(Result); + return Result; } /// Parser of parameters for LoopUnroll pass. Index: llvm/lib/ProfileData/Coverage/CoverageMapping.cpp =================================================================== --- llvm/lib/ProfileData/Coverage/CoverageMapping.cpp +++ llvm/lib/ProfileData/Coverage/CoverageMapping.cpp @@ -260,14 +260,14 @@ for (const auto &CoverageReader : CoverageReaders) { for (auto RecordOrErr : *CoverageReader) { if (Error E = RecordOrErr.takeError()) - return std::move(E); + return E; const auto &Record = *RecordOrErr; if (Error E = Coverage->loadFunctionRecord(Record, ProfileReader)) - return std::move(E); + return E; } } - return std::move(Coverage); + return Coverage; } Expected> @@ -275,7 +275,7 @@ StringRef ProfileFilename, ArrayRef Arches) { auto ProfileReaderOrErr = IndexedInstrProfReader::create(ProfileFilename); if (Error E = ProfileReaderOrErr.takeError()) - return std::move(E); + return E; auto ProfileReader = std::move(ProfileReaderOrErr.get()); SmallVector, 4> Readers; @@ -290,7 +290,7 @@ auto CoverageReadersOrErr = BinaryCoverageReader::create(CovMappingBufRef, Arch, Buffers); if (Error E = CoverageReadersOrErr.takeError()) - return std::move(E); + return E; for (auto &Reader : CoverageReadersOrErr.get()) Readers.push_back(std::move(Reader)); Buffers.push_back(std::move(CovMappingBufOrErr.get())); Index: llvm/lib/ProfileData/Coverage/CoverageMappingReader.cpp =================================================================== --- llvm/lib/ProfileData/Coverage/CoverageMappingReader.cpp +++ llvm/lib/ProfileData/Coverage/CoverageMappingReader.cpp @@ -321,28 +321,28 @@ // A dummy coverage mapping data consists of just one region with zero count. uint64_t NumFileMappings; if (Error Err = readSize(NumFileMappings)) - return std::move(Err); + return Err; if (NumFileMappings != 1) return false; // We don't expect any specific value for the filename index, just skip it. uint64_t FilenameIndex; if (Error Err = readIntMax(FilenameIndex, std::numeric_limits::max())) - return std::move(Err); + return Err; uint64_t NumExpressions; if (Error Err = readSize(NumExpressions)) - return std::move(Err); + return Err; if (NumExpressions != 0) return false; uint64_t NumRegions; if (Error Err = readSize(NumRegions)) - return std::move(Err); + return Err; if (NumRegions != 1) return false; uint64_t EncodedCounterAndRegion; if (Error Err = readIntMax(EncodedCounterAndRegion, std::numeric_limits::max())) - return std::move(Err); + return Err; unsigned Tag = EncodedCounterAndRegion & Counter::EncodingTagMask; return Tag == Counter::Zero; } @@ -494,7 +494,7 @@ size_t FilenamesBegin = Filenames.size(); RawCoverageFilenamesReader Reader(StringRef(Buf, FilenamesSize), Filenames); if (auto Err = Reader.read()) - return std::move(Err); + return Err; Buf += FilenamesSize; // We'll read the coverage mapping records in the loop below. @@ -521,7 +521,7 @@ if (Error Err = insertFunctionRecordIfNeeded(CFR, Mapping, FilenamesBegin)) - return std::move(Err); + return Err; CFR++; } return Buf; @@ -545,7 +545,7 @@ case CovMapVersion::Version3: // Decompress the name data. if (Error E = P.create(P.getNameData())) - return std::move(E); + return E; if (Version == CovMapVersion::Version2) return llvm::make_unique>(P, R, F); @@ -597,26 +597,26 @@ readCoverageMappingData( Reader->ProfileNames, Coverage, Reader->MappingRecords, Reader->Filenames)) - return std::move(E); + return E; } else if (BytesInAddress == 4 && Endian == support::endianness::big) { if (Error E = readCoverageMappingData( Reader->ProfileNames, Coverage, Reader->MappingRecords, Reader->Filenames)) - return std::move(E); + return E; } else if (BytesInAddress == 8 && Endian == support::endianness::little) { if (Error E = readCoverageMappingData( Reader->ProfileNames, Coverage, Reader->MappingRecords, Reader->Filenames)) - return std::move(E); + return E; } else if (BytesInAddress == 8 && Endian == support::endianness::big) { if (Error E = readCoverageMappingData( Reader->ProfileNames, Coverage, Reader->MappingRecords, Reader->Filenames)) - return std::move(E); + return E; } else return make_error(coveragemap_error::malformed); - return std::move(Reader); + return Reader; } static Expected> @@ -643,7 +643,7 @@ return make_error(coveragemap_error::malformed); InstrProfSymtab ProfileNames; if (Error E = ProfileNames.create(Data.substr(0, ProfileNamesSize), Address)) - return std::move(E); + return E; StringRef CoverageMapping = Data.substr(ProfileNamesSize); // Skip the padding bytes because coverage map data has an alignment of 8. if (CoverageMapping.empty()) @@ -708,12 +708,12 @@ lookupSection(*OF, getInstrProfSectionName(IPSK_name, ObjFormat, /*AddSegmentInfo=*/false)); if (auto E = NamesSection.takeError()) - return std::move(E); + return E; auto CoverageSection = lookupSection(*OF, getInstrProfSectionName(IPSK_covmap, ObjFormat, /*AddSegmentInfo=*/false)); if (auto E = CoverageSection.takeError()) - return std::move(E); + return E; // Get the contents of the given sections. auto CoverageMappingOrErr = CoverageSection->getContents(); @@ -722,7 +722,7 @@ InstrProfSymtab ProfileNames; if (Error E = ProfileNames.create(*NamesSection)) - return std::move(E); + return E; return BinaryCoverageReader::createCoverageReaderFromBuffer( CoverageMappingOrErr.get(), std::move(ProfileNames), BytesInAddress, @@ -741,7 +741,7 @@ if (!ReaderOrErr) return ReaderOrErr.takeError(); Readers.push_back(std::move(ReaderOrErr.get())); - return std::move(Readers); + return Readers; } auto BinOrErr = createBinary(ObjectBuffer); @@ -786,7 +786,7 @@ Readers.push_back(std::move(Reader)); } if (Err) - return std::move(Err); + return Err; // Thin archives reference object files outside of the archive file, i.e. // files which reside in memory not owned by the caller. Transfer ownership @@ -795,14 +795,14 @@ for (auto &Buffer : Ar->takeThinBuffers()) ObjectFileBuffers.push_back(std::move(Buffer)); - return std::move(Readers); + return Readers; } auto ReaderOrErr = loadBinaryFormat(std::move(Bin), Arch); if (!ReaderOrErr) return ReaderOrErr.takeError(); Readers.push_back(std::move(ReaderOrErr.get())); - return std::move(Readers); + return Readers; } Error BinaryCoverageReader::readNextRecord(CoverageMappingRecord &Record) { Index: llvm/lib/ProfileData/GCOV.cpp =================================================================== --- llvm/lib/ProfileData/GCOV.cpp +++ llvm/lib/ProfileData/GCOV.cpp @@ -711,7 +711,7 @@ errs() << EC.message() << "\n"; return llvm::make_unique(); } - return std::move(OS); + return OS; } /// print - Print source files with collected line count information. Index: llvm/lib/ProfileData/InstrProf.cpp =================================================================== --- llvm/lib/ProfileData/InstrProf.cpp +++ llvm/lib/ProfileData/InstrProf.cpp @@ -891,9 +891,9 @@ Error E = VPD->checkIntegrity(); if (E) - return std::move(E); + return E; - return std::move(VPD); + return VPD; } void ValueProfData::swapBytesToHost(support::endianness Endianness) { Index: llvm/lib/ProfileData/InstrProfReader.cpp =================================================================== --- llvm/lib/ProfileData/InstrProfReader.cpp +++ llvm/lib/ProfileData/InstrProfReader.cpp @@ -55,7 +55,7 @@ // Set up the buffer to read. auto BufferOrError = setupMemoryBuffer(Path); if (Error E = BufferOrError.takeError()) - return std::move(E); + return E; return InstrProfReader::create(std::move(BufferOrError.get())); } @@ -83,9 +83,9 @@ // Initialize the reader and return the result. if (Error E = initializeReader(*Result)) - return std::move(E); + return E; - return std::move(Result); + return Result; } Expected> @@ -93,7 +93,7 @@ // Set up the buffer to read. auto BufferOrError = setupMemoryBuffer(Path); if (Error E = BufferOrError.takeError()) - return std::move(E); + return E; // Set up the remapping buffer if requested. std::unique_ptr RemappingBuffer; @@ -101,7 +101,7 @@ if (!RemappingPathStr.empty()) { auto RemappingBufferOrError = setupMemoryBuffer(RemappingPathStr); if (Error E = RemappingBufferOrError.takeError()) - return std::move(E); + return E; RemappingBuffer = std::move(RemappingBufferOrError.get()); } @@ -124,9 +124,9 @@ // Initialize the reader and return the result. if (Error E = initializeReader(*Result)) - return std::move(E); + return E; - return std::move(Result); + return Result; } void InstrProfIterator::Increment() { @@ -864,7 +864,7 @@ ArrayRef Data; Error Err = Remapper->getRecords(FuncName, Data); if (Err) - return std::move(Err); + return Err; // Found it. Look for counters with the right hash. for (unsigned I = 0, E = Data.size(); I < E; ++I) { // Check for a match and fill the vector if there is one. Index: llvm/lib/ProfileData/SampleProfReader.cpp =================================================================== --- llvm/lib/ProfileData/SampleProfReader.cpp +++ llvm/lib/ProfileData/SampleProfReader.cpp @@ -959,7 +959,7 @@ if (uint64_t(Buffer->getBufferSize()) > std::numeric_limits::max()) return sampleprof_error::too_large; - return std::move(Buffer); + return Buffer; } /// Create a sample profile reader based on the format of the input file. @@ -1023,7 +1023,7 @@ if (std::error_code EC = Reader->readHeader()) return EC; - return std::move(Reader); + return Reader; } // For text and GCC file formats, we compute the summary after reading the Index: llvm/lib/ProfileData/SampleProfWriter.cpp =================================================================== --- llvm/lib/ProfileData/SampleProfWriter.cpp +++ llvm/lib/ProfileData/SampleProfWriter.cpp @@ -386,7 +386,7 @@ if (EC) return EC; - return std::move(Writer); + return Writer; } void SampleProfileWriter::computeSummary( Index: llvm/lib/Remarks/YAMLRemarkParser.cpp =================================================================== --- llvm/lib/Remarks/YAMLRemarkParser.cpp +++ llvm/lib/Remarks/YAMLRemarkParser.cpp @@ -156,7 +156,7 @@ : llvm::make_unique(Buf); if (SeparateBuf) Result->SeparateBuf = std::move(SeparateBuf); - return std::move(Result); + return Result; } YAMLRemarkParser::YAMLRemarkParser(StringRef Buf) @@ -182,7 +182,7 @@ Expected> YAMLRemarkParser::parseRemark(yaml::Document &RemarkEntry) { if (Error E = error()) - return std::move(E); + return E; yaml::Node *YAMLRoot = RemarkEntry.getRoot(); if (!YAMLRoot) { @@ -259,7 +259,7 @@ return error("Type, Pass, Name or Function missing.", *RemarkEntry.getRoot()); - return std::move(Result); + return Result; } Expected YAMLRemarkParser::parseType(yaml::MappingNode &Node) { Index: llvm/lib/Support/FileCheck.cpp =================================================================== --- llvm/lib/Support/FileCheck.cpp +++ llvm/lib/Support/FileCheck.cpp @@ -70,7 +70,7 @@ Err = joinErrors(std::move(Err), LeftOp.takeError()); if (!RightOp) Err = joinErrors(std::move(Err), RightOp.takeError()); - return std::move(Err); + return Err; } return EvalBinop(*LeftOp, *RightOp); @@ -254,7 +254,7 @@ FileCheckPatternContext *Context, const SourceMgr &SM) { Expr = Expr.ltrim(SpaceChars); if (Expr.empty()) - return std::move(LeftOp); + return LeftOp; // Check if this is a supported operation and select a function to perform // it. @@ -342,7 +342,7 @@ DefinedNumericVariable = *ParseResult; } - return std::move(ExpressionAST); + return ExpressionAST; } bool FileCheckPattern::parsePattern(StringRef PatternStr, StringRef Prefix, Index: llvm/lib/Support/JSON.cpp =================================================================== --- llvm/lib/Support/JSON.cpp +++ llvm/lib/Support/JSON.cpp @@ -513,7 +513,7 @@ if (P.checkUTF8()) if (P.parseValue(E)) if (P.assertEnd()) - return std::move(E); + return E; return P.takeError(); } char ParseError::ID = 0; Index: llvm/lib/Support/MemoryBuffer.cpp =================================================================== --- llvm/lib/Support/MemoryBuffer.cpp +++ llvm/lib/Support/MemoryBuffer.cpp @@ -128,7 +128,7 @@ if (!Buf) return make_error_code(errc::not_enough_memory); memcpy(Buf->getBufferStart(), InputData.data(), InputData.size()); - return std::move(Buf); + return Buf; } std::unique_ptr @@ -396,7 +396,7 @@ Offset, EC)); if (EC) return EC; - return std::move(Result); + return Result; } ErrorOr> @@ -448,7 +448,7 @@ new (NamedBufferAlloc(Filename)) MemoryBufferMMapFile( RequiresNullTerminator, FD, MapSize, Offset, EC)); if (!EC) - return std::move(Result); + return Result; } auto Buf = WritableMemoryBuffer::getNewUninitMemBuffer(MapSize, Filename); @@ -460,7 +460,7 @@ sys::fs::readNativeFileSlice(FD, Buf->getBuffer(), Offset); - return std::move(Buf); + return Buf; } ErrorOr> Index: llvm/lib/Support/Path.cpp =================================================================== --- llvm/lib/Support/Path.cpp +++ llvm/lib/Support/Path.cpp @@ -1240,7 +1240,7 @@ return errorCodeToError(EC); } #endif - return std::move(Ret); + return Ret; } } Index: llvm/lib/Support/YAMLTraits.cpp =================================================================== --- llvm/lib/Support/YAMLTraits.cpp +++ llvm/lib/Support/YAMLTraits.cpp @@ -389,7 +389,7 @@ break; SQHNode->Entries.push_back(std::move(Entry)); } - return std::move(SQHNode); + return SQHNode; } else if (MappingNode *Map = dyn_cast(N)) { auto mapHNode = llvm::make_unique(N); for (KeyValueNode &KVN : *Map) { @@ -414,7 +414,7 @@ break; mapHNode->Mapping[KeyStr] = std::move(ValueHNode); } - return std::move(mapHNode); + return mapHNode; } else if (isa(N)) { return llvm::make_unique(N); } else { Index: llvm/lib/TableGen/JSONBackend.cpp =================================================================== --- llvm/lib/TableGen/JSONBackend.cpp +++ llvm/lib/TableGen/JSONBackend.cpp @@ -54,7 +54,7 @@ json::Array array; for (unsigned i = 0, limit = Bits->getNumBits(); i < limit; i++) array.push_back(translateInit(*Bits->getBit(i))); - return std::move(array); + return array; } else if (auto *Int = dyn_cast(&I)) { return Int->getValue(); } else if (auto *Str = dyn_cast(&I)) { @@ -65,7 +65,7 @@ json::Array array; for (auto val : *List) array.push_back(translateInit(*val)); - return std::move(array); + return array; } // Init subclasses that we return as JSON objects containing a @@ -79,17 +79,17 @@ if (auto *Def = dyn_cast(&I)) { obj["kind"] = "def"; obj["def"] = Def->getDef()->getName(); - return std::move(obj); + return obj; } else if (auto *Var = dyn_cast(&I)) { obj["kind"] = "var"; obj["var"] = Var->getName(); - return std::move(obj); + return obj; } else if (auto *VarBit = dyn_cast(&I)) { if (auto *Var = dyn_cast(VarBit->getBitVar())) { obj["kind"] = "varbit"; obj["var"] = Var->getName(); obj["index"] = VarBit->getBitNum(); - return std::move(obj); + return obj; } } else if (auto *Dag = dyn_cast(&I)) { obj["kind"] = "dag"; @@ -107,7 +107,7 @@ args.push_back(std::move(arg)); } obj["args"] = std::move(args); - return std::move(obj); + return obj; } // Final fallback: anything that gets past here is simply given a @@ -116,7 +116,7 @@ assert(!I.isConcrete()); obj["kind"] = "complex"; - return std::move(obj); + return obj; } void JSONEmitter::run(raw_ostream &OS) { Index: llvm/lib/TextAPI/ELF/TBEHandler.cpp =================================================================== --- llvm/lib/TextAPI/ELF/TBEHandler.cpp +++ llvm/lib/TextAPI/ELF/TBEHandler.cpp @@ -149,7 +149,7 @@ if (std::error_code Err = YamlIn.error()) return createStringError(Err, "YAML failed reading as TBE"); - return std::move(Stub); + return Stub; } Error elfabi::writeTBEToOutputStream(raw_ostream &OS, const ELFStub &Stub) { Index: llvm/lib/TextAPI/MachO/TextStub.cpp =================================================================== --- llvm/lib/TextAPI/MachO/TextStub.cpp +++ llvm/lib/TextAPI/MachO/TextStub.cpp @@ -638,7 +638,7 @@ if (YAMLIn.error()) return make_error(Ctx.ErrorMessage, YAMLIn.error()); - return std::move(File); + return File; } Error TextAPIWriter::writeToStream(raw_ostream &OS, const InterfaceFile &File) { Index: llvm/lib/Transforms/IPO/FunctionImport.cpp =================================================================== --- llvm/lib/Transforms/IPO/FunctionImport.cpp +++ llvm/lib/Transforms/IPO/FunctionImport.cpp @@ -1104,7 +1104,7 @@ // If modules were created with lazy metadata loading, materialize it // now, before linking it (otherwise this will be a noop). if (Error Err = SrcModule->materializeMetadata()) - return std::move(Err); + return Err; auto &ImportGUIDs = FunctionsToImportPerModule->second; // Find the globals to import @@ -1119,7 +1119,7 @@ << SrcModule->getSourceFileName() << "\n"); if (Import) { if (Error Err = F.materialize()) - return std::move(Err); + return Err; if (EnableImportMetadata) { // Add 'thinlto_src_module' metadata for statistics and debugging. F.setMetadata( @@ -1141,7 +1141,7 @@ << SrcModule->getSourceFileName() << "\n"); if (Import) { if (Error Err = GV.materialize()) - return std::move(Err); + return Err; ImportedGVCount += GlobalsToImport.insert(&GV); } } @@ -1155,11 +1155,11 @@ << SrcModule->getSourceFileName() << "\n"); if (Import) { if (Error Err = GA.materialize()) - return std::move(Err); + return Err; // Import alias as a copy of its aliasee. GlobalObject *Base = GA.getBaseObject(); if (Error Err = Base->materialize()) - return std::move(Err); + return Err; auto *Fn = replaceAliasWithAliasee(SrcModule.get(), &GA); LLVM_DEBUG(dbgs() << "Is importing aliasee fn " << Base->getGUID() << " " << Base->getName() << " from " Index: llvm/lib/XRay/FDRRecordProducer.cpp =================================================================== --- llvm/lib/XRay/FDRRecordProducer.cpp +++ llvm/lib/XRay/FDRRecordProducer.cpp @@ -101,8 +101,8 @@ R = std::move(MetadataRecordOrErr.get()); RecordInitializer RI(E, OffsetPtr); if (auto Err = R->apply(RI)) - return std::move(Err); - return std::move(R); + return Err; + return R; } } } @@ -132,7 +132,7 @@ assert(isa(R.get())); auto BE = dyn_cast(R.get()); CurrentBufferBytes = BE->size(); - return std::move(R); + return R; } // @@ -171,7 +171,7 @@ RecordInitializer RI(E, OffsetPtr); if (auto Err = R->apply(RI)) - return std::move(Err); + return Err; // If we encountered a BufferExtents record, we should record the remaining // bytes for the current buffer, to determine when we should start ignoring @@ -190,7 +190,7 @@ CurrentBufferBytes -= OffsetPtr - PreReadOffset; } assert(R != nullptr); - return std::move(R); + return R; } } // namespace xray Index: llvm/lib/XRay/FileHeaderReader.cpp =================================================================== --- llvm/lib/XRay/FileHeaderReader.cpp +++ llvm/lib/XRay/FileHeaderReader.cpp @@ -62,7 +62,7 @@ // Manually advance the offset pointer 16 bytes, after getting a raw memcpy // from the underlying data. OffsetPtr += 16; - return std::move(FileHeader); + return FileHeader; } } // namespace xray Index: llvm/lib/XRay/InstrumentationMap.cpp =================================================================== --- llvm/lib/XRay/InstrumentationMap.cpp +++ llvm/lib/XRay/InstrumentationMap.cpp @@ -219,26 +219,26 @@ if (!FdOrErr) { // Report the ELF load error if YAML failed. consumeError(FdOrErr.takeError()); - return std::move(E); + return E; } uint64_t FileSize; if (sys::fs::file_size(Filename, FileSize)) - return std::move(E); + return E; // If the file is empty, we return the original error. if (FileSize == 0) - return std::move(E); + return E; // From this point on the errors will be only for the YAML parts, so we // consume the errors at this point. consumeError(std::move(E)); if (auto E = loadYAML(*FdOrErr, FileSize, Filename, Map.Sleds, Map.FunctionAddresses, Map.FunctionIds)) - return std::move(E); + return E; } else if (auto E = loadObj(Filename, *ObjectFileOrError, Map.Sleds, Map.FunctionAddresses, Map.FunctionIds)) { - return std::move(E); + return E; } return Map; } Index: llvm/lib/XRay/Profile.cpp =================================================================== --- llvm/lib/XRay/Profile.cpp +++ llvm/lib/XRay/Profile.cpp @@ -90,7 +90,7 @@ CurrentOffset = Offset; Path.push_back(FuncId); } while (FuncId != 0); - return std::move(Path); + return Path; } static Expected readData(DataExtractor &Extractor, @@ -137,7 +137,7 @@ std::vector Path; for (auto Node = It->second; Node; Node = Node->Caller) Path.push_back(Node->Func); - return std::move(Path); + return Path; } Profile::PathID Profile::internPath(ArrayRef P) { @@ -308,7 +308,7 @@ if (auto E = P.addBlock(Profile::Block{Profile::ThreadID{Header.Thread}, {{P.internPath(Path), std::move(Data)}}})) - return std::move(E); + return E; } return P; @@ -393,7 +393,7 @@ std::vector>( PathsData.begin(), PathsData.end()), })) - return std::move(E); + return E; } return P; Index: llvm/lib/XRay/Trace.cpp =================================================================== --- llvm/lib/XRay/Trace.cpp +++ llvm/lib/XRay/Trace.cpp @@ -436,7 +436,7 @@ if (Version == 1 || Version == 2 || Version == 3) { if (auto E = loadNaiveFormatLog(DE.getData(), DE.isLittleEndian(), T.FileHeader, T.Records)) - return std::move(E); + return E; } else { return make_error( Twine("Unsupported version for Basic/Naive Mode logging: ") + @@ -448,7 +448,7 @@ if (Version >= 1 && Version <= 5) { if (auto E = loadFDRLog(DE.getData(), DE.isLittleEndian(), T.FileHeader, T.Records)) - return std::move(E); + return E; } else { return make_error( Twine("Unsupported version for FDR Mode logging: ") + Twine(Version), @@ -457,7 +457,7 @@ break; default: if (auto E = loadYAMLLog(DE.getData(), T.FileHeader, T.Records)) - return std::move(E); + return E; } if (Sort) @@ -465,5 +465,5 @@ return L.TSC < R.TSC; }); - return std::move(T); + return T; } Index: llvm/tools/bugpoint/ExecutionDriver.cpp =================================================================== --- llvm/tools/bugpoint/ExecutionDriver.cpp +++ llvm/tools/bugpoint/ExecutionDriver.cpp @@ -347,7 +347,7 @@ OutputFile, AdditionalLinkerArgs, SharedObjs, Timeout, MemoryLimit); if (Error E = RetVal.takeError()) - return std::move(E); + return E; if (*RetVal == -1) { errs() << ""; @@ -393,12 +393,12 @@ Expected FT = SafeInterpreter->OutputCode(BitcodeFile, OutputFile); if (Error E = FT.takeError()) - return std::move(E); + return E; std::string SharedObjectFile; if (Error E = cc->MakeSharedObject(OutputFile, *FT, SharedObjectFile, AdditionalLinkerArgs)) - return std::move(E); + return E; // Remove the intermediate C file sys::fs::remove(OutputFile); @@ -444,7 +444,7 @@ Expected Output = executeProgram(Program, "", BitcodeFile, SharedObject, nullptr); if (Error E = Output.takeError()) - return std::move(E); + return E; std::string Error; bool FilesDifferent = false; Index: llvm/tools/bugpoint/ListReducer.h =================================================================== --- llvm/tools/bugpoint/ListReducer.h +++ llvm/tools/bugpoint/ListReducer.h @@ -49,7 +49,7 @@ std::mt19937 randomness(0x6e5ea738); // Seed the random number generator Expected Result = doTest(TheList, empty); if (Error E = Result.takeError()) - return std::move(E); + return E; switch (*Result) { case KeepPrefix: if (TheList.size() == 1) // we are done, it's the base case and it fails @@ -122,7 +122,7 @@ Expected Result = doTest(Prefix, Suffix); if (Error E = Result.takeError()) - return std::move(E); + return E; switch (*Result) { case KeepSuffix: // The property still holds. We can just drop the prefix elements, and @@ -185,7 +185,7 @@ Expected Result = doTest(EmptyList, TestList); if (Error E = Result.takeError()) - return std::move(E); + return E; if (*Result == KeepSuffix) { // We can trim down the list! TheList.swap(TestList); Index: llvm/tools/bugpoint/Miscompilation.cpp =================================================================== --- llvm/tools/bugpoint/Miscompilation.cpp +++ llvm/tools/bugpoint/Miscompilation.cpp @@ -82,7 +82,7 @@ Expected Diff = BD.diffProgram(BD.getProgram(), BitcodeResult, "", true /*delete bitcode*/); if (Error E = Diff.takeError()) - return std::move(E); + return E; if (*Diff) { outs() << " nope.\n"; if (Suffix.empty()) { @@ -123,7 +123,7 @@ // If the prefix maintains the predicate by itself, only keep the prefix! Diff = BD.diffProgram(BD.getProgram(), BitcodeResult, "", false); if (Error E = Diff.takeError()) - return std::move(E); + return E; if (*Diff) { outs() << " nope.\n"; sys::fs::remove(BitcodeResult); @@ -169,7 +169,7 @@ Diff = BD.diffProgram(BD.getProgram(), BitcodeResult, "", true /*delete bitcode*/); if (Error E = Diff.takeError()) - return std::move(E); + return E; if (*Diff) { outs() << " nope.\n"; return KeepSuffix; @@ -200,14 +200,14 @@ if (!Suffix.empty()) { Expected Ret = TestFuncs(Suffix); if (Error E = Ret.takeError()) - return std::move(E); + return E; if (*Ret) return KeepSuffix; } if (!Prefix.empty()) { Expected Ret = TestFuncs(Prefix); if (Error E = Ret.takeError()) - return std::move(E); + return E; if (*Ret) return KeepPrefix; } @@ -237,9 +237,9 @@ // Execute the program. Expected Diff = BD.diffProgram(*Merged, "", "", false); if (Error E = Diff.takeError()) - return std::move(E); + return E; Broken = *Diff; - return std::move(Merged); + return Merged; } /// split functions in a Module into two groups: those that are under @@ -335,7 +335,7 @@ Expected> New = testMergedProgram( BD, *ToOptimizeLoopExtracted, *ToNotOptimize, Failure); if (Error E = New.takeError()) - return std::move(E); + return E; if (!*New) return false; @@ -377,7 +377,7 @@ Expected Result = TestFn(BD, std::move(ToOptimizeLoopExtracted), std::move(ToNotOptimize)); if (Error E = Result.takeError()) - return std::move(E); + return E; ToOptimizeLoopExtracted = std::move(TOLEBackup); ToNotOptimize = std::move(TNOBackup); @@ -460,14 +460,14 @@ if (!Suffix.empty()) { Expected Ret = TestFuncs(Suffix); if (Error E = Ret.takeError()) - return std::move(E); + return E; if (*Ret) return KeepSuffix; } if (!Prefix.empty()) { Expected Ret = TestFuncs(Prefix); if (Error E = Ret.takeError()) - return std::move(E); + return E; if (*Ret) return KeepPrefix; } @@ -554,7 +554,7 @@ Expected Ret = ReduceMiscompiledBlocks(BD, TestFn, MiscompiledFunctions) .TestFuncs(std::vector()); if (Error E = Ret.takeError()) - return std::move(E); + return E; if (*Ret) { Blocks.clear(); } else { @@ -562,7 +562,7 @@ ReduceMiscompiledBlocks(BD, TestFn, MiscompiledFunctions) .reduceList(Blocks); if (Error E = Ret.takeError()) - return std::move(E); + return E; if (Blocks.size() == OldSize) return false; } @@ -629,7 +629,7 @@ .reduceList(MiscompiledFunctions); if (Error E = Ret.takeError()) { errs() << "\n***Cannot reduce functions: "; - return std::move(E); + return E; } } outs() << "\n*** The following function" @@ -644,7 +644,7 @@ if (!BugpointIsInterrupted && !DisableLoopExtraction) { Expected Ret = ExtractLoops(BD, TestFn, MiscompiledFunctions); if (Error E = Ret.takeError()) - return std::move(E); + return E; if (*Ret) { // Okay, we extracted some loops and the problem still appears. See if // we can eliminate some of the created functions from being candidates. @@ -655,7 +655,7 @@ Ret = ReduceMiscompilingFunctions(BD, TestFn) .reduceList(MiscompiledFunctions); if (Error E = Ret.takeError()) - return std::move(E); + return E; outs() << "\n*** The following function" << (MiscompiledFunctions.size() == 1 ? " is" : "s are") @@ -668,7 +668,7 @@ if (!BugpointIsInterrupted && !DisableBlockExtraction) { Expected Ret = ExtractBlocks(BD, TestFn, MiscompiledFunctions); if (Error E = Ret.takeError()) - return std::move(E); + return E; if (*Ret) { // Okay, we extracted some blocks and the problem still appears. See if // we can eliminate some of the created functions from being candidates. @@ -678,7 +678,7 @@ Ret = ReduceMiscompilingFunctions(BD, TestFn) .reduceList(MiscompiledFunctions); if (Error E = Ret.takeError()) - return std::move(E); + return E; outs() << "\n*** The following function" << (MiscompiledFunctions.size() == 1 ? " is" : "s are") @@ -708,7 +708,7 @@ BD.EmitProgressBitcode(*Test, "pass-error", false); BD.setNewProgram(std::move(Test)); if (Error E = BD.debugOptimizerCrash()) - return std::move(E); + return E; return false; } outs() << "done.\n"; @@ -717,7 +717,7 @@ bool Broken; auto Result = testMergedProgram(BD, *Optimized, *Safe, Broken); if (Error E = Result.takeError()) - return std::move(E); + return E; if (auto New = std::move(*Result)) { outs() << (Broken ? " nope.\n" : " yup.\n"); // Delete the original and set the new program. @@ -982,7 +982,7 @@ Expected SharedObject = BD.compileSharedObject(SafeModuleBC.str()); if (Error E = SharedObject.takeError()) - return std::move(E); + return E; FileRemover SharedObjectRemover(*SharedObject, !SaveTemps); @@ -991,7 +991,7 @@ Expected Result = BD.diffProgram(BD.getProgram(), TestModuleBC.str(), *SharedObject, false); if (Error E = Result.takeError()) - return std::move(E); + return E; if (*Result) errs() << ": still failing!\n"; Index: llvm/tools/bugpoint/ToolRunner.cpp =================================================================== --- llvm/tools/bugpoint/ToolRunner.cpp +++ llvm/tools/bugpoint/ToolRunner.cpp @@ -492,7 +492,7 @@ OutputCode(Bitcode, OutputAsmFile, Timeout, MemoryLimit); FileRemover OutFileRemover(OutputAsmFile, !SaveTemps); if (Error E = FileKind.takeError()) - return std::move(E); + return E; std::vector CCArgs(ArgsForCC); CCArgs.insert(CCArgs.end(), SharedLibs.begin(), SharedLibs.end()); Index: llvm/tools/dsymutil/BinaryHolder.cpp =================================================================== --- llvm/tools/dsymutil/BinaryHolder.cpp +++ llvm/tools/dsymutil/BinaryHolder.cpp @@ -197,7 +197,7 @@ } } if (Err) - return std::move(Err); + return Err; } if (OE.Objects.empty()) @@ -243,7 +243,7 @@ auto Err = OE.load(Filename, Verbose); if (Err) { ObjectCache.erase(Filename); - return std::move(Err); + return Err; } } Index: llvm/tools/dsymutil/DebugMap.cpp =================================================================== --- llvm/tools/dsymutil/DebugMap.cpp +++ llvm/tools/dsymutil/DebugMap.cpp @@ -142,7 +142,7 @@ return EC; std::vector> Result; Result.push_back(std::move(Res)); - return std::move(Result); + return Result; } } // end namespace dsymutil Index: llvm/tools/dsymutil/MachODebugMapParser.cpp =================================================================== --- llvm/tools/dsymutil/MachODebugMapParser.cpp +++ llvm/tools/dsymutil/MachODebugMapParser.cpp @@ -364,7 +364,7 @@ if (shouldLinkArch(Archs, Object->getArchTriple().getArchName())) Results.push_back(parseOneBinary(*Object, BinaryPath)); - return std::move(Results); + return Results; } /// Interpret the STAB entries to fill the DebugMap. Index: llvm/tools/dsymutil/dsymutil.cpp =================================================================== --- llvm/tools/dsymutil/dsymutil.cpp +++ llvm/tools/dsymutil/dsymutil.cpp @@ -323,9 +323,9 @@ if (Path.empty()) Path = DwarfFile + ".dSYM"; if (auto E = createBundleDir(Path)) - return std::move(E); + return E; if (auto E = createPlistFile(DwarfFile, Path)) - return std::move(E); + return E; llvm::sys::path::append(Path, "Contents", "Resources"); std::string ResourceDir = Path.str(); Index: llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp =================================================================== --- llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp +++ llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp @@ -73,14 +73,14 @@ Expected> MemBufOrErr = errorOrToExpected(MemoryBuffer::getFileOrSTDIN(Path)); if (Error E = MemBufOrErr.takeError()) - return std::move(E); + return E; std::unique_ptr MemBuf = std::move(*MemBufOrErr); if (MemBuf->getBufferSize() & 3) return reportError( "Bitcode stream should be a multiple of 4 bytes in length"); - return std::move(MemBuf); + return MemBuf; } int main(int argc, char **argv) { Index: llvm/tools/llvm-cfi-verify/lib/FileAnalysis.cpp =================================================================== --- llvm/tools/llvm-cfi-verify/lib/FileAnalysis.cpp +++ llvm/tools/llvm-cfi-verify/lib/FileAnalysis.cpp @@ -99,15 +99,15 @@ // Init the rest of the object. if (auto InitResponse = Analysis.initialiseDisassemblyMembers()) - return std::move(InitResponse); + return InitResponse; if (auto SectionParseResponse = Analysis.parseCodeSections()) - return std::move(SectionParseResponse); + return SectionParseResponse; if (auto SymbolTableParseResponse = Analysis.parseSymbolTable()) - return std::move(SymbolTableParseResponse); + return SymbolTableParseResponse; - return std::move(Analysis); + return Analysis; } FileAnalysis::FileAnalysis(object::OwningBinary Binary) Index: llvm/tools/llvm-cov/SourceCoverageView.cpp =================================================================== --- llvm/tools/llvm-cov/SourceCoverageView.cpp +++ llvm/tools/llvm-cov/SourceCoverageView.cpp @@ -69,7 +69,7 @@ auto OS = CoveragePrinter::OwnedStream(RawStream); if (E) return errorCodeToError(E); - return std::move(OS); + return OS; } std::unique_ptr Index: llvm/tools/llvm-dwp/llvm-dwp.cpp =================================================================== --- llvm/tools/llvm-dwp/llvm-dwp.cpp +++ llvm/tools/llvm-dwp/llvm-dwp.cpp @@ -498,7 +498,7 @@ DWOPaths.push_back(std::move(DWOName)); } } - return std::move(DWOPaths); + return DWOPaths; } static Error write(MCStreamer &Out, ArrayRef Inputs) { Index: llvm/tools/llvm-elfabi/ELFObjHandler.cpp =================================================================== --- llvm/tools/llvm-elfabi/ELFObjHandler.cpp +++ llvm/tools/llvm-elfabi/ELFObjHandler.cpp @@ -309,7 +309,7 @@ // Collect relevant .dynamic entries. DynamicEntries DynEnt; if (Error Err = populateDynamic(DynEnt, *DynTable)) - return std::move(Err); + return Err; // Get pointer to in-memory location of .dynstr section. Expected DynStrPtr = @@ -364,7 +364,7 @@ "when reading dynamic symbols"); } - return std::move(DestStub); + return DestStub; } Expected> readELFFile(MemoryBufferRef Buf) { Index: llvm/tools/llvm-exegesis/lib/BenchmarkRunner.cpp =================================================================== --- llvm/tools/llvm-exegesis/lib/BenchmarkRunner.cpp +++ llvm/tools/llvm-exegesis/lib/BenchmarkRunner.cpp @@ -177,7 +177,7 @@ llvm::SmallString<256> ResultPath; if (llvm::Error E = llvm::errorCodeToError(llvm::sys::fs::createTemporaryFile( "snippet", "o", ResultFD, ResultPath))) - return std::move(E); + return E; llvm::raw_fd_ostream OFS(ResultFD, true /*ShouldClose*/); assembleToStream(State.getExegesisTarget(), State.createTargetMachine(), BC.LiveIns, BC.RegisterInitialValues, Code, OFS); Index: llvm/tools/llvm-exegesis/lib/Clustering.cpp =================================================================== --- llvm/tools/llvm-exegesis/lib/Clustering.cpp +++ llvm/tools/llvm-exegesis/lib/Clustering.cpp @@ -325,7 +325,7 @@ InstructionBenchmarkClustering Clustering( Points, AnalysisClusteringEpsilon * AnalysisClusteringEpsilon); if (auto Error = Clustering.validateAndSetup()) { - return std::move(Error); + return Error; } if (Clustering.ErrorCluster_.PointIndices.size() == Points.size()) { return Clustering; // Nothing to cluster. Index: llvm/tools/llvm-exegesis/lib/Latency.cpp =================================================================== --- llvm/tools/llvm-exegesis/lib/Latency.cpp +++ llvm/tools/llvm-exegesis/lib/Latency.cpp @@ -162,7 +162,7 @@ if (Results.empty()) return llvm::make_error( "No strategy found to make the execution serial"); - return std::move(Results); + return Results; } LatencyBenchmarkRunner::LatencyBenchmarkRunner(const LLVMState &State, @@ -203,7 +203,7 @@ default: break; } - return std::move(Result); + return Result; } } // namespace exegesis Index: llvm/tools/llvm-exegesis/lib/SnippetGenerator.cpp =================================================================== --- llvm/tools/llvm-exegesis/lib/SnippetGenerator.cpp +++ llvm/tools/llvm-exegesis/lib/SnippetGenerator.cpp @@ -126,7 +126,7 @@ setRandomAliasing(SelfAliasing, IT, IT); } CT.Instructions.push_back(std::move(IT)); - return std::move(Result); + return Result; } llvm::Expected> @@ -137,7 +137,7 @@ CodeTemplate &CT = Result.back(); CT.Info = llvm::formatv("{0}, repeating an unconstrained assignment", Msg); CT.Instructions.emplace_back(Instr); - return std::move(Result); + return Result; } std::mt19937 &randomGenerator() { Index: llvm/tools/llvm-exegesis/lib/Uops.cpp =================================================================== --- llvm/tools/llvm-exegesis/lib/Uops.cpp +++ llvm/tools/llvm-exegesis/lib/Uops.cpp @@ -274,7 +274,7 @@ Result.push_back( BenchmarkMeasure::Create("NumMicroOps", *ExpectedCounterValue)); } - return std::move(Result); + return Result; } constexpr const size_t UopsSnippetGenerator::kMinNumDifferentAddresses; Index: llvm/tools/llvm-exegesis/lib/X86/Target.cpp =================================================================== --- llvm/tools/llvm-exegesis/lib/X86/Target.cpp +++ llvm/tools/llvm-exegesis/lib/X86/Target.cpp @@ -190,7 +190,7 @@ X86LatencySnippetGenerator::generateCodeTemplates( const Instruction &Instr) const { if (auto E = IsInvalidOpcode(Instr)) - return std::move(E); + return E; switch (getX86FPFlags(Instr)) { case llvm::X86II::NotFP: @@ -227,7 +227,7 @@ X86UopsSnippetGenerator::generateCodeTemplates( const Instruction &Instr) const { if (auto E = IsInvalidOpcode(Instr)) - return std::move(E); + return E; switch (getX86FPFlags(Instr)) { case llvm::X86II::NotFP: @@ -358,7 +358,7 @@ initStack(RegBitWidth / 8); add(loadToReg(Reg, Opcode)); add(releaseStackSpace(RegBitWidth / 8)); - return std::move(Instructions); + return Instructions; } std::vector ConstantInliner::loadX87STAndFinalize(unsigned Reg) { @@ -373,7 +373,7 @@ if (Reg != llvm::X86::ST0) add(llvm::MCInstBuilder(llvm::X86::ST_Frr).addReg(Reg)); add(releaseStackSpace(kF80Bytes)); - return std::move(Instructions); + return Instructions; } std::vector ConstantInliner::loadX87FPAndFinalize(unsigned Reg) { @@ -387,13 +387,13 @@ .addImm(0) // Disp .addReg(0)); // Segment add(releaseStackSpace(kF80Bytes)); - return std::move(Instructions); + return Instructions; } std::vector ConstantInliner::popFlagAndFinalize() { initStack(8); add(llvm::MCInstBuilder(llvm::X86::POPF64)); - return std::move(Instructions); + return Instructions; } void ConstantInliner::initStack(unsigned Bytes) { Index: llvm/tools/llvm-mca/llvm-mca.cpp =================================================================== --- llvm/tools/llvm-mca/llvm-mca.cpp +++ llvm/tools/llvm-mca/llvm-mca.cpp @@ -224,7 +224,7 @@ auto Out = llvm::make_unique(OutputFilename, EC, sys::fs::OF_None); if (!EC) - return std::move(Out); + return Out; return EC; } } // end of anonymous namespace Index: llvm/tools/llvm-objcopy/COFF/Reader.cpp =================================================================== --- llvm/tools/llvm-objcopy/COFF/Reader.cpp +++ llvm/tools/llvm-objcopy/COFF/Reader.cpp @@ -217,15 +217,15 @@ } if (Error E = readExecutableHeaders(*Obj)) - return std::move(E); + return E; if (Error E = readSections(*Obj)) - return std::move(E); + return E; if (Error E = readSymbols(*Obj, IsBigObj)) - return std::move(E); + return E; if (Error E = setSymbolTargets(*Obj)) - return std::move(E); + return E; - return std::move(Obj); + return Obj; } } // end namespace coff Index: llvm/tools/llvm-objcopy/CopyConfig.cpp =================================================================== --- llvm/tools/llvm-objcopy/CopyConfig.cpp +++ llvm/tools/llvm-objcopy/CopyConfig.cpp @@ -570,7 +570,7 @@ for (auto Arg : InputArgs.filtered(OBJCOPY_redefine_symbols)) if (Error E = addSymbolsToRenameFromFile(Config.SymbolsToRename, DC.Alloc, Arg->getValue())) - return std::move(E); + return E; for (auto Arg : InputArgs.filtered(OBJCOPY_rename_section)) { Expected SR = @@ -658,43 +658,43 @@ for (auto Arg : InputArgs.filtered(OBJCOPY_localize_symbols)) if (Error E = addSymbolsFromFile(Config.SymbolsToLocalize, DC.Alloc, Arg->getValue(), UseRegex)) - return std::move(E); + return E; for (auto Arg : InputArgs.filtered(OBJCOPY_keep_global_symbol)) Config.SymbolsToKeepGlobal.emplace_back(Arg->getValue(), UseRegex); for (auto Arg : InputArgs.filtered(OBJCOPY_keep_global_symbols)) if (Error E = addSymbolsFromFile(Config.SymbolsToKeepGlobal, DC.Alloc, Arg->getValue(), UseRegex)) - return std::move(E); + return E; for (auto Arg : InputArgs.filtered(OBJCOPY_globalize_symbol)) Config.SymbolsToGlobalize.emplace_back(Arg->getValue(), UseRegex); for (auto Arg : InputArgs.filtered(OBJCOPY_globalize_symbols)) if (Error E = addSymbolsFromFile(Config.SymbolsToGlobalize, DC.Alloc, Arg->getValue(), UseRegex)) - return std::move(E); + return E; for (auto Arg : InputArgs.filtered(OBJCOPY_weaken_symbol)) Config.SymbolsToWeaken.emplace_back(Arg->getValue(), UseRegex); for (auto Arg : InputArgs.filtered(OBJCOPY_weaken_symbols)) if (Error E = addSymbolsFromFile(Config.SymbolsToWeaken, DC.Alloc, Arg->getValue(), UseRegex)) - return std::move(E); + return E; for (auto Arg : InputArgs.filtered(OBJCOPY_strip_symbol)) Config.SymbolsToRemove.emplace_back(Arg->getValue(), UseRegex); for (auto Arg : InputArgs.filtered(OBJCOPY_strip_symbols)) if (Error E = addSymbolsFromFile(Config.SymbolsToRemove, DC.Alloc, Arg->getValue(), UseRegex)) - return std::move(E); + return E; for (auto Arg : InputArgs.filtered(OBJCOPY_strip_unneeded_symbol)) Config.UnneededSymbolsToRemove.emplace_back(Arg->getValue(), UseRegex); for (auto Arg : InputArgs.filtered(OBJCOPY_strip_unneeded_symbols)) if (Error E = addSymbolsFromFile(Config.UnneededSymbolsToRemove, DC.Alloc, Arg->getValue(), UseRegex)) - return std::move(E); + return E; for (auto Arg : InputArgs.filtered(OBJCOPY_keep_symbol)) Config.SymbolsToKeep.emplace_back(Arg->getValue(), UseRegex); for (auto Arg : InputArgs.filtered(OBJCOPY_keep_symbols)) if (Error E = addSymbolsFromFile(Config.SymbolsToKeep, DC.Alloc, Arg->getValue(), UseRegex)) - return std::move(E); + return E; for (auto Arg : InputArgs.filtered(OBJCOPY_add_symbol)) { Expected NSI = parseNewSymbolInfo(Arg->getValue()); if (!NSI) @@ -755,7 +755,7 @@ "--extract-main-partition"); DC.CopyConfigs.push_back(std::move(Config)); - return std::move(DC); + return DC; } // ParseStripOptions returns the config and sets the input arguments. If a @@ -862,7 +862,7 @@ if (Error E = ErrorCallback(createStringError( errc::invalid_argument, "'%s' was already specified", Filename.str().c_str()))) - return std::move(E); + return E; } Config.InputFilename = Filename; Config.OutputFilename = Filename; @@ -875,7 +875,7 @@ return createStringError(errc::invalid_argument, "--preserve-dates requires a file"); - return std::move(DC); + return DC; } } // namespace objcopy Index: llvm/tools/llvm-objcopy/ELF/Object.cpp =================================================================== --- llvm/tools/llvm-objcopy/ELF/Object.cpp +++ llvm/tools/llvm-objcopy/ELF/Object.cpp @@ -277,7 +277,7 @@ "line is too short: %zu chars.", Line.size()); if (Error E = checkChars(Line)) - return std::move(E); + return E; IHexRecord Rec; size_t DataLen = checkedGetHex(Line.substr(1, 2)); @@ -293,7 +293,7 @@ if (getChecksum(Line.drop_front(1)) != 0) return createStringError(errc::invalid_argument, "incorrect checksum."); if (Error E = checkRecord(Rec)) - return std::move(E); + return E; return Rec; } @@ -1636,7 +1636,7 @@ if (!HasSections) return parseError(-1U, "no sections"); - return std::move(Records); + return Records; } std::unique_ptr IHexReader::create() const { Index: llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp =================================================================== --- llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp +++ llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp @@ -429,7 +429,7 @@ return make_error(raw_error_code::corrupt_file, "Invalid module stream"); - return std::move(ModS); + return ModS; } template Index: llvm/tools/llvm-pdbutil/InputFile.cpp =================================================================== --- llvm/tools/llvm-pdbutil/InputFile.cpp +++ llvm/tools/llvm-pdbutil/InputFile.cpp @@ -60,7 +60,7 @@ return make_error(raw_error_code::corrupt_file, "Invalid module stream"); - return std::move(ModS); + return ModS; } static inline bool isCodeViewDebugSubsection(object::SectionRef Section, @@ -268,18 +268,18 @@ IF.CoffObject = std::move(*BinaryOrErr); IF.PdbOrObj = llvm::cast(IF.CoffObject.getBinary()); - return std::move(IF); + return IF; } if (Magic == file_magic::pdb) { std::unique_ptr Session; if (auto Err = loadDataForPDB(PDB_ReaderType::Native, Path, Session)) - return std::move(Err); + return Err; IF.PdbSession.reset(static_cast(Session.release())); IF.PdbOrObj = &IF.PdbSession->getPDBFile(); - return std::move(IF); + return IF; } if (!AllowUnknownFile) @@ -294,7 +294,7 @@ IF.UnknownFile = std::move(*Result); IF.PdbOrObj = IF.UnknownFile.get(); - return std::move(IF); + return IF; } PDBFile &InputFile::pdb() { Index: llvm/tools/llvm-rc/ResourceScriptParser.cpp =================================================================== --- llvm/tools/llvm-rc/ResourceScriptParser.cpp +++ llvm/tools/llvm-rc/ResourceScriptParser.cpp @@ -19,7 +19,7 @@ // Take an expression returning llvm::Error and forward the error if it exists. #define RETURN_IF_ERROR(Expr) \ if (auto Err = (Expr)) \ - return std::move(Err); + return Err; // Take an expression returning llvm::Expected and assign it to Var or // forward the error out of the function. @@ -295,7 +295,7 @@ auto FailureHandler = [&](llvm::Error Err) -> Expected> { if (Result.size() < MinCount) - return std::move(Err); + return Err; consumeError(std::move(Err)); return Result; }; @@ -315,7 +315,7 @@ return FailureHandler(IntResult.takeError()); } - return std::move(Result); + return Result; } Expected RCParser::parseFlags(ArrayRef FlagDesc, @@ -386,7 +386,7 @@ Result.addStmt(std::move(*SingleParse)); } - return std::move(Result); + return Result; } Expected> @@ -442,7 +442,7 @@ Accels->addAccelerator(*EventResult, *IDResult, *FlagsResult); } - return std::move(Accels); + return Accels; } RCParser::ParseType RCParser::parseCursorResource() { @@ -484,7 +484,7 @@ Dialog->addControl(std::move(*ControlDefResult)); } - return std::move(Dialog); + return Dialog; } RCParser::ParseType RCParser::parseUserDefinedResource(IntOrString Type) { @@ -679,7 +679,7 @@ llvm::make_unique(*CaptionResult, MenuResult, *FlagsResult)); } - return std::move(List); + return List; } RCParser::ParseType RCParser::parseStringTableResource() { @@ -702,7 +702,7 @@ Table->addString(*IDResult, *StrResult); } - return std::move(Table); + return Table; } Expected> @@ -718,7 +718,7 @@ consume(); // Consume BlockEnd. - return std::move(Contents); + return Contents; } Expected> RCParser::parseVersionInfoStmt() { Index: llvm/tools/llvm-rc/ResourceScriptToken.cpp =================================================================== --- llvm/tools/llvm-rc/ResourceScriptToken.cpp +++ llvm/tools/llvm-rc/ResourceScriptToken.cpp @@ -170,7 +170,7 @@ const size_t TokenStart = Pos; if (Error TokenError = consumeToken(TokenKind)) - return std::move(TokenError); + return TokenError; // Comments are just deleted, don't bother saving them. if (TokenKind == Kind::LineComment || TokenKind == Kind::StartComment) Index: llvm/tools/obj2yaml/elf2yaml.cpp =================================================================== --- llvm/tools/obj2yaml/elf2yaml.cpp +++ llvm/tools/obj2yaml/elf2yaml.cpp @@ -161,10 +161,10 @@ for (const Elf_Shdr &Sec : Sections) { if (Sec.sh_type == ELF::SHT_SYMTAB) if (Error E = dumpSymbols(&Sec, Y->Symbols)) - return std::move(E); + return E; if (Sec.sh_type == ELF::SHT_DYNSYM) if (Error E = dumpSymbols(&Sec, Y->DynamicSymbols)) - return std::move(E); + return E; } for (const Elf_Shdr &Sec : Sections) { @@ -414,7 +414,7 @@ ELFDumper::dumpDynamicSection(const Elf_Shdr *Shdr) { auto S = make_unique(); if (Error E = dumpCommonSection(Shdr, *S)) - return std::move(E); + return E; auto DynTagsOrErr = Obj.template getSectionContentsAsArray(Shdr); if (!DynTagsOrErr) @@ -431,7 +431,7 @@ ELFDumper::dumpRelocSection(const Elf_Shdr *Shdr) { auto S = make_unique(); if (auto E = dumpCommonRelocationSection(Shdr, *S)) - return std::move(E); + return E; auto SymTabOrErr = Obj.getSection(Shdr->sh_link); if (!SymTabOrErr) @@ -445,7 +445,7 @@ for (const Elf_Rel &Rel : *Rels) { ELFYAML::Relocation R; if (Error E = dumpRelocation(&Rel, SymTab, R)) - return std::move(E); + return E; S->Relocations.push_back(R); } } else { @@ -455,7 +455,7 @@ for (const Elf_Rela &Rel : *Rels) { ELFYAML::Relocation R; if (Error E = dumpRelocation(&Rel, SymTab, R)) - return std::move(E); + return E; R.Addend = Rel.r_addend; S->Relocations.push_back(R); } @@ -469,7 +469,7 @@ ELFDumper::dumpContentSection(const Elf_Shdr *Shdr) { auto S = make_unique(); if (Error E = dumpCommonSection(Shdr, *S)) - return std::move(E); + return E; auto ContentOrErr = Obj.getSectionContents(Shdr); if (!ContentOrErr) @@ -487,7 +487,7 @@ ELFDumper::dumpNoBitsSection(const Elf_Shdr *Shdr) { auto S = make_unique(); if (Error E = dumpCommonSection(Shdr, *S)) - return std::move(E); + return E; S->Size = Shdr->sh_size; return S.release(); @@ -501,7 +501,7 @@ auto S = make_unique(); if (Error E = dumpCommonSection(Shdr, *S)) - return std::move(E); + return E; S->Info = Shdr->sh_info; @@ -550,7 +550,7 @@ auto S = make_unique(); if (Error E = dumpCommonSection(Shdr, *S)) - return std::move(E); + return E; auto VersionsOrErr = Obj.template getSectionContentsAsArray(Shdr); if (!VersionsOrErr) @@ -569,7 +569,7 @@ auto S = make_unique(); if (Error E = dumpCommonSection(Shdr, *S)) - return std::move(E); + return E; S->Info = Shdr->sh_info; @@ -622,7 +622,7 @@ Expected ELFDumper::dumpGroup(const Elf_Shdr *Shdr) { auto S = make_unique(); if (Error E = dumpCommonSection(Shdr, *S)) - return std::move(E); + return E; auto SymtabOrErr = Obj.getSection(Shdr->sh_link); if (!SymtabOrErr) @@ -670,7 +670,7 @@ "Section type is not SHT_MIPS_ABIFLAGS"); auto S = make_unique(); if (Error E = dumpCommonSection(Shdr, *S)) - return std::move(E); + return E; auto ContentOrErr = Obj.getSectionContents(Shdr); if (!ContentOrErr) Index: llvm/tools/obj2yaml/macho2yaml.cpp =================================================================== --- llvm/tools/obj2yaml/macho2yaml.cpp +++ llvm/tools/obj2yaml/macho2yaml.cpp @@ -189,7 +189,7 @@ std::unique_ptr DICtx = DWARFContext::create(Obj); if (auto Err = dwarf2yaml(*DICtx, Y->DWARF)) return errorCodeToError(Err); - return std::move(Y); + return Y; } void MachODumper::dumpHeader(std::unique_ptr &Y) { Index: llvm/utils/TableGen/GlobalISelEmitter.cpp =================================================================== --- llvm/utils/TableGen/GlobalISelEmitter.cpp +++ llvm/utils/TableGen/GlobalISelEmitter.cpp @@ -3508,7 +3508,7 @@ if (auto Error = importChildMatcher(Rule, InsnMatcher, SrcChild, OperandIsAPointer, OpIdx++, TempOpIdx)) - return std::move(Error); + return Error; } } @@ -3714,7 +3714,7 @@ auto InsertPtOrError = createAndImportSubInstructionRenderer( ++InsertPt, Rule, DstChild, TempRegID); if (auto Error = InsertPtOrError.takeError()) - return std::move(Error); + return Error; return InsertPtOrError.get(); } @@ -3786,7 +3786,7 @@ RuleMatcher &M, const TreePatternNode *Dst) { auto InsertPtOrError = createInstructionRenderer(M.actions_end(), M, Dst); if (auto Error = InsertPtOrError.takeError()) - return std::move(Error); + return Error; action_iterator InsertPt = InsertPtOrError.get(); BuildMIAction &DstMIBuilder = *static_cast(InsertPt->get()); @@ -3795,7 +3795,7 @@ if (auto Error = importExplicitUseRenderers(InsertPt, M, DstMIBuilder, Dst) .takeError()) - return std::move(Error); + return Error; return DstMIBuilder; } @@ -3809,7 +3809,7 @@ // TODO: Assert there's exactly one result. if (auto Error = InsertPtOrError.takeError()) - return std::move(Error); + return Error; BuildMIAction &DstMIBuilder = *static_cast(InsertPtOrError.get()->get()); @@ -3820,7 +3820,7 @@ InsertPtOrError = importExplicitUseRenderers(InsertPtOrError.get(), M, DstMIBuilder, Dst); if (auto Error = InsertPtOrError.takeError()) - return std::move(Error); + return Error; M.insertAction(InsertPt, DstMIBuilder.getInsnID()); @@ -3920,7 +3920,7 @@ DagInit *DefaultOps = DstIOperand.Rec->getValueAsDag("DefaultOps"); if (auto Error = importDefaultOperandRenderers( InsertPt, M, DstMIBuilder, DefaultOps)) - return std::move(Error); + return Error; ++NumDefaultOps; continue; } @@ -3928,7 +3928,7 @@ auto InsertPtOrError = importExplicitUseRenderer(InsertPt, M, DstMIBuilder, Dst->getChild(Child)); if (auto Error = InsertPtOrError.takeError()) - return std::move(Error); + return Error; InsertPt = InsertPtOrError.get(); ++Child; } @@ -4009,7 +4009,7 @@ llvm::to_string(*P.getDstPattern())); if (auto Error = importRulePredicates(M, P.getPredicates())) - return std::move(Error); + return Error; // Next, analyze the pattern operators. TreePatternNode *Src = P.getSrcPattern(); @@ -4049,7 +4049,7 @@ auto InsnMatcherOrError = createAndImportSelDAGMatcher(M, InsnMatcherTemp, Src, TempOpIdx); if (auto Error = InsnMatcherOrError.takeError()) - return std::move(Error); + return Error; InstructionMatcher &InsnMatcher = InsnMatcherOrError.get(); if (Dst->isLeaf()) { @@ -4077,7 +4077,7 @@ // We're done with this pattern! It's eligible for GISel emission; return // it. ++NumPatternImported; - return std::move(M); + return M; } return failedImport("Dst pattern root isn't a known leaf"); @@ -4135,13 +4135,13 @@ auto DstMIBuilderOrError = createAndImportInstructionRenderer(M, Dst); if (auto Error = DstMIBuilderOrError.takeError()) - return std::move(Error); + return Error; BuildMIAction &DstMIBuilder = DstMIBuilderOrError.get(); // Render the implicit defs. // These are only added to the root of the result. if (auto Error = importImplicitDefRenderers(DstMIBuilder, P.getDstRegs())) - return std::move(Error); + return Error; DstMIBuilder.chooseInsnToMutate(M); @@ -4162,7 +4162,7 @@ // We're done with this pattern! It's eligible for GISel emission; return // it. ++NumPatternImported; - return std::move(M); + return M; } if (DstI.TheDef->getName() == "EXTRACT_SUBREG") { @@ -4205,14 +4205,14 @@ // We're done with this pattern! It's eligible for GISel emission; return // it. ++NumPatternImported; - return std::move(M); + return M; } M.addAction(0); // We're done with this pattern! It's eligible for GISel emission; return it. ++NumPatternImported; - return std::move(M); + return M; } // Emit imm predicate table and an enum to reference them with.