From c25572bf2993438f24b57d859d072e8b2aa975d2 Mon Sep 17 00:00:00 2001 From: Matheus Izvekov Date: Wed, 9 Jun 2021 01:00:48 +0200 Subject: [PATCH] [clang] NFC: rename SK_CastDerivedToBaseRValue to SK_CastDerivedToBasePRValue This is a follow up to the "rvalue-to-prvalue" rename at D103720. Signed-off-by: Matheus Izvekov Depends on D103720 Reviewed By: rsmith Differential Revision: https://reviews.llvm.org/D103933 --- clang/include/clang/Sema/Initialization.h | 2 +- clang/lib/Sema/SemaInit.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/clang/include/clang/Sema/Initialization.h b/clang/include/clang/Sema/Initialization.h index 9889d5b..8feb669 100644 --- a/clang/include/clang/Sema/Initialization.h +++ b/clang/include/clang/Sema/Initialization.h @@ -804,7 +804,7 @@ public: SK_ResolveAddressOfOverloadedFunction, /// Perform a derived-to-base cast, producing an rvalue. - SK_CastDerivedToBaseRValue, + SK_CastDerivedToBasePRValue, /// Perform a derived-to-base cast, producing an xvalue. SK_CastDerivedToBaseXValue, diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index 430b148..26d681b 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -3457,7 +3457,7 @@ LLVM_DUMP_METHOD void InitializedEntity::dump() const { void InitializationSequence::Step::Destroy() { switch (Kind) { case SK_ResolveAddressOfOverloadedFunction: - case SK_CastDerivedToBaseRValue: + case SK_CastDerivedToBasePRValue: case SK_CastDerivedToBaseXValue: case SK_CastDerivedToBaseLValue: case SK_BindReference: @@ -3585,7 +3585,7 @@ void InitializationSequence::AddDerivedToBaseCastStep(QualType BaseType, Step S; switch (VK) { case VK_PRValue: - S.Kind = SK_CastDerivedToBaseRValue; + S.Kind = SK_CastDerivedToBasePRValue; break; case VK_XValue: S.Kind = SK_CastDerivedToBaseXValue; break; case VK_LValue: S.Kind = SK_CastDerivedToBaseLValue; break; @@ -8106,7 +8106,7 @@ ExprResult InitializationSequence::Perform(Sema &S, // initializer. switch (Steps.front().Kind) { case SK_ResolveAddressOfOverloadedFunction: - case SK_CastDerivedToBaseRValue: + case SK_CastDerivedToBasePRValue: case SK_CastDerivedToBaseXValue: case SK_CastDerivedToBaseLValue: case SK_BindReference: @@ -8191,7 +8191,7 @@ ExprResult InitializationSequence::Perform(Sema &S, Step->Function.Function); break; - case SK_CastDerivedToBaseRValue: + case SK_CastDerivedToBasePRValue: case SK_CastDerivedToBaseXValue: case SK_CastDerivedToBaseLValue: { // We have a derived-to-base cast that produces either an rvalue or an @@ -9617,8 +9617,8 @@ void InitializationSequence::dump(raw_ostream &OS) const { OS << "resolve address of overloaded function"; break; - case SK_CastDerivedToBaseRValue: - OS << "derived-to-base (rvalue)"; + case SK_CastDerivedToBasePRValue: + OS << "derived-to-base (prvalue)"; break; case SK_CastDerivedToBaseXValue: -- 2.7.4