diff --git a/clang/include/clang/Sema/Initialization.h b/clang/include/clang/Sema/Initialization.h --- a/clang/include/clang/Sema/Initialization.h +++ b/clang/include/clang/Sema/Initialization.h @@ -804,7 +804,7 @@ 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 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -3457,7 +3457,7 @@ 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 @@ 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 @@ // 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 @@ 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 @@ 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: