Index: ASTContext.cpp
===================================================================
--- ASTContext.cpp
+++ ASTContext.cpp
@@ -364,14 +364,14 @@
     } else {
       RC = getRawCommentForDeclNoCache(I);
       OriginalDeclForRC = I;
-      RawCommentAndCacheFlags Raw;
+      RedeclComments[I] = RawCommentAndCacheFlags();
+      RawCommentAndCacheFlags &Raw = RedeclComments[I];
       if (RC) {
         Raw.setRaw(RC);
         Raw.setKind(RawCommentAndCacheFlags::FromDecl);
       } else
         Raw.setKind(RawCommentAndCacheFlags::NoCommentInDecl);
       Raw.setOriginalDecl(I);
-      RedeclComments[I] = Raw;
       if (RC)
         break;
     }