r262576 - Caught and fixed a typo in r262572.

Sean Callanan via cfe-commits cfe-commits at lists.llvm.org
Wed Mar 2 18:22:05 PST 2016


Author: spyffe
Date: Wed Mar  2 20:22:05 2016
New Revision: 262576

URL: http://llvm.org/viewvc/llvm-project?rev=262576&view=rev
Log:
Caught and fixed a typo in r262572.

I should have checked and imported D's in-class initializer.
Instead I accidentally used ToField's in-class initializer,
which is always NULL so ToField will never get one.

<rdar://problem/24943405>

Modified:
    cfe/trunk/lib/AST/ASTImporter.cpp

Modified: cfe/trunk/lib/AST/ASTImporter.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTImporter.cpp?rev=262576&r1=262575&r2=262576&view=diff
==============================================================================
--- cfe/trunk/lib/AST/ASTImporter.cpp (original)
+++ cfe/trunk/lib/AST/ASTImporter.cpp Wed Mar  2 20:22:05 2016
@@ -3038,7 +3038,7 @@ Decl *ASTNodeImporter::VisitFieldDecl(Fi
                                          D->getInClassInitStyle());
   ToField->setAccess(D->getAccess());
   ToField->setLexicalDeclContext(LexicalDC);
-  if (Expr *FromInitializer = ToField->getInClassInitializer()) {
+  if (Expr *FromInitializer = D->getInClassInitializer()) {
     Expr *ToInitializer = Importer.Import(FromInitializer);
     if (ToInitializer)
       ToField->setInClassInitializer(ToInitializer);




More information about the cfe-commits mailing list