diff options
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/AST/Expr.cpp | 13 | ||||
| -rw-r--r-- | clang/lib/Serialization/ASTReaderStmt.cpp | 2 |
2 files changed, 5 insertions, 10 deletions
diff --git a/clang/lib/AST/Expr.cpp b/clang/lib/AST/Expr.cpp index cd5a63aab51..a4365f1c44a 100644 --- a/clang/lib/AST/Expr.cpp +++ b/clang/lib/AST/Expr.cpp @@ -281,11 +281,8 @@ DeclRefExpr::DeclRefExpr(NestedNameSpecifierLoc QualifierLoc, : Expr(DeclRefExprClass, T, VK, OK_Ordinary, false, false, false), D(D), Loc(NameLoc) { DeclRefExprBits.HasQualifier = QualifierLoc ? 1 : 0; - if (QualifierLoc) { - DeclRefExprBits.HasQualifier = 1; - NameQualifier *NQ = getNameQualifier(); - NQ->QualifierLoc = QualifierLoc; - } + if (QualifierLoc) + getNameQualifier().QualifierLoc = QualifierLoc; DeclRefExprBits.HasExplicitTemplateArgs = TemplateArgs ? 1 : 0; if (TemplateArgs) { @@ -302,10 +299,8 @@ DeclRefExpr::DeclRefExpr(NestedNameSpecifierLoc QualifierLoc, : Expr(DeclRefExprClass, T, VK, OK_Ordinary, false, false, false), D(D), Loc(NameInfo.getLoc()), DNLoc(NameInfo.getInfo()) { DeclRefExprBits.HasQualifier = QualifierLoc ? 1 : 0; - if (QualifierLoc) { - NameQualifier *NQ = getNameQualifier(); - NQ->QualifierLoc = QualifierLoc; - } + if (QualifierLoc) + getNameQualifier().QualifierLoc = QualifierLoc; DeclRefExprBits.HasExplicitTemplateArgs = TemplateArgs ? 1 : 0; if (TemplateArgs) diff --git a/clang/lib/Serialization/ASTReaderStmt.cpp b/clang/lib/Serialization/ASTReaderStmt.cpp index f0b5abaf3bf..38b41bb55f5 100644 --- a/clang/lib/Serialization/ASTReaderStmt.cpp +++ b/clang/lib/Serialization/ASTReaderStmt.cpp @@ -432,7 +432,7 @@ void ASTStmtReader::VisitDeclRefExpr(DeclRefExpr *E) { NumTemplateArgs = Record[Idx++]; if (E->hasQualifier()) - E->getNameQualifier()->QualifierLoc + E->getNameQualifier().QualifierLoc = Reader.ReadNestedNameSpecifierLoc(F, Record, Idx); if (E->hasExplicitTemplateArgs()) |
