diff options
Diffstat (limited to 'lib/Sema/SemaInit.cpp')
| -rw-r--r-- | lib/Sema/SemaInit.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp index 3ff2588356..c7a2769c44 100644 --- a/lib/Sema/SemaInit.cpp +++ b/lib/Sema/SemaInit.cpp @@ -3201,8 +3201,12 @@ InitializationSequence::Perform(Sema &S, return S.Owned((Expr *)0); QualType DestType = Entity.getType().getType().getNonReferenceType(); + // FIXME: Ugly hack around the fact that Entity.getType().getType() is not + // the same as Entity.getDecl()->getType() in cases involving type merging, + // and we want latter when it makes sense. if (ResultType) - *ResultType = Entity.getType().getType(); + *ResultType = Entity.getDecl() ? Entity.getDecl()->getType() : + Entity.getType().getType(); Sema::OwningExprResult CurInit = S.Owned((Expr *)0); |