This revision was landed with ongoing or failed builds. This revision was automatically updated to reflect the committed changes. Closed by commit rGe32cde6f41cd: [clang] Use IgnoreParensSingleStep in more places (authored by aeubanks).
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D151479/new/ https://reviews.llvm.org/D151479 Files: clang/lib/Sema/SemaInit.cpp Index: clang/lib/Sema/SemaInit.cpp =================================================================== --- clang/lib/Sema/SemaInit.cpp +++ clang/lib/Sema/SemaInit.cpp @@ -15,6 +15,7 @@ #include "clang/AST/ExprCXX.h" #include "clang/AST/ExprObjC.h" #include "clang/AST/ExprOpenMP.h" +#include "clang/AST/IgnoreExpr.h" #include "clang/AST/TypeLoc.h" #include "clang/Basic/CharInfo.h" #include "clang/Basic/SourceManager.h" @@ -170,22 +171,9 @@ while (true) { E->setType(Ty); E->setValueKind(VK_PRValue); - if (isa<StringLiteral>(E) || isa<ObjCEncodeExpr>(E)) { - break; - } else if (ParenExpr *PE = dyn_cast<ParenExpr>(E)) { - E = PE->getSubExpr(); - } else if (UnaryOperator *UO = dyn_cast<UnaryOperator>(E)) { - assert(UO->getOpcode() == UO_Extension); - E = UO->getSubExpr(); - } else if (GenericSelectionExpr *GSE = dyn_cast<GenericSelectionExpr>(E)) { - E = GSE->getResultExpr(); - } else if (ChooseExpr *CE = dyn_cast<ChooseExpr>(E)) { - E = CE->getChosenSubExpr(); - } else if (PredefinedExpr *PE = dyn_cast<PredefinedExpr>(E)) { - E = PE->getFunctionName(); - } else { - llvm_unreachable("unexpected expr in string literal init"); - } + if (isa<StringLiteral>(E) || isa<ObjCEncodeExpr>(E)) + break; + E = IgnoreParensSingleStep(E); } } @@ -194,20 +182,9 @@ static void updateGNUCompoundLiteralRValue(Expr *E) { while (true) { E->setValueKind(VK_PRValue); - if (isa<CompoundLiteralExpr>(E)) { - break; - } else if (ParenExpr *PE = dyn_cast<ParenExpr>(E)) { - E = PE->getSubExpr(); - } else if (UnaryOperator *UO = dyn_cast<UnaryOperator>(E)) { - assert(UO->getOpcode() == UO_Extension); - E = UO->getSubExpr(); - } else if (GenericSelectionExpr *GSE = dyn_cast<GenericSelectionExpr>(E)) { - E = GSE->getResultExpr(); - } else if (ChooseExpr *CE = dyn_cast<ChooseExpr>(E)) { - E = CE->getChosenSubExpr(); - } else { - llvm_unreachable("unexpected expr in array compound literal init"); - } + if (isa<CompoundLiteralExpr>(E)) + break; + E = IgnoreParensSingleStep(E); } }
Index: clang/lib/Sema/SemaInit.cpp =================================================================== --- clang/lib/Sema/SemaInit.cpp +++ clang/lib/Sema/SemaInit.cpp @@ -15,6 +15,7 @@ #include "clang/AST/ExprCXX.h" #include "clang/AST/ExprObjC.h" #include "clang/AST/ExprOpenMP.h" +#include "clang/AST/IgnoreExpr.h" #include "clang/AST/TypeLoc.h" #include "clang/Basic/CharInfo.h" #include "clang/Basic/SourceManager.h" @@ -170,22 +171,9 @@ while (true) { E->setType(Ty); E->setValueKind(VK_PRValue); - if (isa<StringLiteral>(E) || isa<ObjCEncodeExpr>(E)) { - break; - } else if (ParenExpr *PE = dyn_cast<ParenExpr>(E)) { - E = PE->getSubExpr(); - } else if (UnaryOperator *UO = dyn_cast<UnaryOperator>(E)) { - assert(UO->getOpcode() == UO_Extension); - E = UO->getSubExpr(); - } else if (GenericSelectionExpr *GSE = dyn_cast<GenericSelectionExpr>(E)) { - E = GSE->getResultExpr(); - } else if (ChooseExpr *CE = dyn_cast<ChooseExpr>(E)) { - E = CE->getChosenSubExpr(); - } else if (PredefinedExpr *PE = dyn_cast<PredefinedExpr>(E)) { - E = PE->getFunctionName(); - } else { - llvm_unreachable("unexpected expr in string literal init"); - } + if (isa<StringLiteral>(E) || isa<ObjCEncodeExpr>(E)) + break; + E = IgnoreParensSingleStep(E); } } @@ -194,20 +182,9 @@ static void updateGNUCompoundLiteralRValue(Expr *E) { while (true) { E->setValueKind(VK_PRValue); - if (isa<CompoundLiteralExpr>(E)) { - break; - } else if (ParenExpr *PE = dyn_cast<ParenExpr>(E)) { - E = PE->getSubExpr(); - } else if (UnaryOperator *UO = dyn_cast<UnaryOperator>(E)) { - assert(UO->getOpcode() == UO_Extension); - E = UO->getSubExpr(); - } else if (GenericSelectionExpr *GSE = dyn_cast<GenericSelectionExpr>(E)) { - E = GSE->getResultExpr(); - } else if (ChooseExpr *CE = dyn_cast<ChooseExpr>(E)) { - E = CE->getChosenSubExpr(); - } else { - llvm_unreachable("unexpected expr in array compound literal init"); - } + if (isa<CompoundLiteralExpr>(E)) + break; + E = IgnoreParensSingleStep(E); } }
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits