[PATCH] D64651: [Driver] Support file paths with -ccc-gcc-name
al3xtjames created this revision. al3xtjames added a reviewer: llvm-commits. Herald added a project: clang. Herald added a subscriber: cfe-commits. When a file path is specified for gcc-name, don't prepend the target triple. This allows -target and -ccc-gcc-name to be used together when a file path is used. Repository: rC Clang https://reviews.llvm.org/D64651 Files: clang/lib/Driver/ToolChains/Gnu.cpp Index: clang/lib/Driver/ToolChains/Gnu.cpp === --- clang/lib/Driver/ToolChains/Gnu.cpp +++ clang/lib/Driver/ToolChains/Gnu.cpp @@ -188,7 +188,12 @@ } else GCCName = "gcc"; - const char *Exec = Args.MakeArgString(getToolChain().GetProgramPath(GCCName)); + const char *Exec; + if (llvm::sys::fs::exists(GCCName)) +Exec = GCCName; + else +Exec = Args.MakeArgString(getToolChain().GetProgramPath(GCCName)); + C.addCommand(llvm::make_unique(JA, *this, Exec, CmdArgs, Inputs)); } Index: clang/lib/Driver/ToolChains/Gnu.cpp === --- clang/lib/Driver/ToolChains/Gnu.cpp +++ clang/lib/Driver/ToolChains/Gnu.cpp @@ -188,7 +188,12 @@ } else GCCName = "gcc"; - const char *Exec = Args.MakeArgString(getToolChain().GetProgramPath(GCCName)); + const char *Exec; + if (llvm::sys::fs::exists(GCCName)) +Exec = GCCName; + else +Exec = Args.MakeArgString(getToolChain().GetProgramPath(GCCName)); + C.addCommand(llvm::make_unique(JA, *this, Exec, CmdArgs, Inputs)); } ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D61838: [Sema] Suppress additional warnings for C's zero initializer
al3xtjames updated this revision to Diff 209994. al3xtjames marked an inline comment as done. al3xtjames added a comment. Added null check for `getInit(0)` Repository: rC Clang CHANGES SINCE LAST ACTION https://reviews.llvm.org/D61838/new/ https://reviews.llvm.org/D61838 Files: clang/lib/AST/Expr.cpp clang/test/Sema/zero-initializer.c Index: clang/test/Sema/zero-initializer.c === --- clang/test/Sema/zero-initializer.c +++ clang/test/Sema/zero-initializer.c @@ -7,6 +7,8 @@ struct B { struct A a; }; struct C { struct B b; }; struct D { struct C c; int n; }; +struct E { short e; }; +struct F { struct E e; int n; }; int main(void) { @@ -23,6 +25,9 @@ struct C p = { 0 }; // no-warning struct C q = { 9 }; // warning suppressed for struct with single element struct D r = { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + struct F s = { 0 }; // no-warning + struct F t = { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + f = (struct foo ) { 0 }; // no-warning g = (struct foo ) { 9 }; // expected-warning {{missing field 'y' initializer}} h = (struct foo ) { 9, 9 }; // no-warning @@ -36,6 +41,8 @@ p = (struct C) { 0 }; // no-warning q = (struct C) { 9 }; // warning suppressed for struct with single element r = (struct D) { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + s = (struct F) { 0 }; // no-warning + t = (struct F) { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} return 0; } Index: clang/lib/AST/Expr.cpp === --- clang/lib/AST/Expr.cpp +++ clang/lib/AST/Expr.cpp @@ -2303,11 +2303,11 @@ bool InitListExpr::isIdiomaticZeroInitializer(const LangOptions &LangOpts) const { assert(isSyntacticForm() && "only test syntactic form as zero initializer"); - if (LangOpts.CPlusPlus || getNumInits() != 1) { + if (LangOpts.CPlusPlus || getNumInits() != 1 || !getInit(0)) { return false; } - const IntegerLiteral *Lit = dyn_cast(getInit(0)); + const IntegerLiteral *Lit = dyn_cast(getInit(0)->IgnoreImplicit()); return Lit && Lit->getValue() == 0; } Index: clang/test/Sema/zero-initializer.c === --- clang/test/Sema/zero-initializer.c +++ clang/test/Sema/zero-initializer.c @@ -7,6 +7,8 @@ struct B { struct A a; }; struct C { struct B b; }; struct D { struct C c; int n; }; +struct E { short e; }; +struct F { struct E e; int n; }; int main(void) { @@ -23,6 +25,9 @@ struct C p = { 0 }; // no-warning struct C q = { 9 }; // warning suppressed for struct with single element struct D r = { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + struct F s = { 0 }; // no-warning + struct F t = { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + f = (struct foo ) { 0 }; // no-warning g = (struct foo ) { 9 }; // expected-warning {{missing field 'y' initializer}} h = (struct foo ) { 9, 9 }; // no-warning @@ -36,6 +41,8 @@ p = (struct C) { 0 }; // no-warning q = (struct C) { 9 }; // warning suppressed for struct with single element r = (struct D) { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + s = (struct F) { 0 }; // no-warning + t = (struct F) { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} return 0; } Index: clang/lib/AST/Expr.cpp === --- clang/lib/AST/Expr.cpp +++ clang/lib/AST/Expr.cpp @@ -2303,11 +2303,11 @@ bool InitListExpr::isIdiomaticZeroInitializer(const LangOptions &LangOpts) const { assert(isSyntacticForm() && "only test syntactic form as zero initializer"); - if (LangOpts.CPlusPlus || getNumInits() != 1) { + if (LangOpts.CPlusPlus || getNumInits() != 1 || !getInit(0)) { return false; } - const IntegerLiteral *Lit = dyn_cast(getInit(0)); + const IntegerLiteral *Lit = dyn_cast(getInit(0)->IgnoreImplicit()); return Lit && Lit->getValue() == 0; } ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D61838: [Sema] Suppress additional warnings for C's zero initializer
al3xtjames added a comment. Thanks! Repository: rL LLVM CHANGES SINCE LAST ACTION https://reviews.llvm.org/D61838/new/ https://reviews.llvm.org/D61838 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D61838: [Sema] Suppress additional warnings for C's zero initializer
al3xtjames created this revision. al3xtjames added a reviewer: cfe-commits. Herald added a project: clang. r314499 relaxed some checks for assigning { 0 } to a structure for all C standards, but it failed to handle structures with non-integer subobjects. Relax -Wmissing-braces checks for such structures, and add some additional tests. This fixes PR39931. Repository: rC Clang https://reviews.llvm.org/D61838 Files: clang/lib/AST/Expr.cpp clang/test/Sema/zero-initializer.c Index: clang/test/Sema/zero-initializer.c === --- clang/test/Sema/zero-initializer.c +++ clang/test/Sema/zero-initializer.c @@ -7,6 +7,8 @@ struct B { struct A a; }; struct C { struct B b; }; struct D { struct C c; int n; }; +struct E { short e; }; +struct F { struct E e; int n; }; int main(void) { @@ -23,6 +25,9 @@ struct C p = { 0 }; // no-warning struct C q = { 9 }; // warning suppressed for struct with single element struct D r = { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + struct F s = { 0 }; // no-warning + struct F t = { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + f = (struct foo ) { 0 }; // no-warning g = (struct foo ) { 9 }; // expected-warning {{missing field 'y' initializer}} h = (struct foo ) { 9, 9 }; // no-warning @@ -36,6 +41,8 @@ p = (struct C) { 0 }; // no-warning q = (struct C) { 9 }; // warning suppressed for struct with single element r = (struct D) { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + s = (struct F) { 0 }; // no-warning + t = (struct F) { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} return 0; } Index: clang/lib/AST/Expr.cpp === --- clang/lib/AST/Expr.cpp +++ clang/lib/AST/Expr.cpp @@ -2090,6 +2090,13 @@ } const IntegerLiteral *Lit = dyn_cast(getInit(0)); + if (!Lit) { +const ImplicitCastExpr *Cast = dyn_cast(getInit(0)); +if (!Cast) + return false; +Lit = dyn_cast(Cast->getSubExpr()); + } + return Lit && Lit->getValue() == 0; } Index: clang/test/Sema/zero-initializer.c === --- clang/test/Sema/zero-initializer.c +++ clang/test/Sema/zero-initializer.c @@ -7,6 +7,8 @@ struct B { struct A a; }; struct C { struct B b; }; struct D { struct C c; int n; }; +struct E { short e; }; +struct F { struct E e; int n; }; int main(void) { @@ -23,6 +25,9 @@ struct C p = { 0 }; // no-warning struct C q = { 9 }; // warning suppressed for struct with single element struct D r = { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + struct F s = { 0 }; // no-warning + struct F t = { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + f = (struct foo ) { 0 }; // no-warning g = (struct foo ) { 9 }; // expected-warning {{missing field 'y' initializer}} h = (struct foo ) { 9, 9 }; // no-warning @@ -36,6 +41,8 @@ p = (struct C) { 0 }; // no-warning q = (struct C) { 9 }; // warning suppressed for struct with single element r = (struct D) { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + s = (struct F) { 0 }; // no-warning + t = (struct F) { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} return 0; } Index: clang/lib/AST/Expr.cpp === --- clang/lib/AST/Expr.cpp +++ clang/lib/AST/Expr.cpp @@ -2090,6 +2090,13 @@ } const IntegerLiteral *Lit = dyn_cast(getInit(0)); + if (!Lit) { +const ImplicitCastExpr *Cast = dyn_cast(getInit(0)); +if (!Cast) + return false; +Lit = dyn_cast(Cast->getSubExpr()); + } + return Lit && Lit->getValue() == 0; } ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D61838: [Sema] Suppress additional warnings for C's zero initializer
al3xtjames updated this revision to Diff 199192. al3xtjames edited the summary of this revision. al3xtjames added a comment. Formatting changes. Repository: rC Clang CHANGES SINCE LAST ACTION https://reviews.llvm.org/D61838/new/ https://reviews.llvm.org/D61838 Files: clang/lib/AST/Expr.cpp clang/test/Sema/zero-initializer.c Index: clang/test/Sema/zero-initializer.c === --- clang/test/Sema/zero-initializer.c +++ clang/test/Sema/zero-initializer.c @@ -7,6 +7,8 @@ struct B { struct A a; }; struct C { struct B b; }; struct D { struct C c; int n; }; +struct E { short e; }; +struct F { struct E e; int n; }; int main(void) { @@ -23,6 +25,9 @@ struct C p = { 0 }; // no-warning struct C q = { 9 }; // warning suppressed for struct with single element struct D r = { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + struct F s = { 0 }; // no-warning + struct F t = { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + f = (struct foo ) { 0 }; // no-warning g = (struct foo ) { 9 }; // expected-warning {{missing field 'y' initializer}} h = (struct foo ) { 9, 9 }; // no-warning @@ -36,6 +41,8 @@ p = (struct C) { 0 }; // no-warning q = (struct C) { 9 }; // warning suppressed for struct with single element r = (struct D) { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + s = (struct F) { 0 }; // no-warning + t = (struct F) { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} return 0; } Index: clang/lib/AST/Expr.cpp === --- clang/lib/AST/Expr.cpp +++ clang/lib/AST/Expr.cpp @@ -2090,6 +2090,10 @@ } const IntegerLiteral *Lit = dyn_cast(getInit(0)); + if (!Lit) { +if (const ImplicitCastExpr *ICE = dyn_cast(getInit(0))) + Lit = dyn_cast(ICE->getSubExpr()); + } return Lit && Lit->getValue() == 0; } Index: clang/test/Sema/zero-initializer.c === --- clang/test/Sema/zero-initializer.c +++ clang/test/Sema/zero-initializer.c @@ -7,6 +7,8 @@ struct B { struct A a; }; struct C { struct B b; }; struct D { struct C c; int n; }; +struct E { short e; }; +struct F { struct E e; int n; }; int main(void) { @@ -23,6 +25,9 @@ struct C p = { 0 }; // no-warning struct C q = { 9 }; // warning suppressed for struct with single element struct D r = { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + struct F s = { 0 }; // no-warning + struct F t = { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + f = (struct foo ) { 0 }; // no-warning g = (struct foo ) { 9 }; // expected-warning {{missing field 'y' initializer}} h = (struct foo ) { 9, 9 }; // no-warning @@ -36,6 +41,8 @@ p = (struct C) { 0 }; // no-warning q = (struct C) { 9 }; // warning suppressed for struct with single element r = (struct D) { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + s = (struct F) { 0 }; // no-warning + t = (struct F) { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} return 0; } Index: clang/lib/AST/Expr.cpp === --- clang/lib/AST/Expr.cpp +++ clang/lib/AST/Expr.cpp @@ -2090,6 +2090,10 @@ } const IntegerLiteral *Lit = dyn_cast(getInit(0)); + if (!Lit) { +if (const ImplicitCastExpr *ICE = dyn_cast(getInit(0))) + Lit = dyn_cast(ICE->getSubExpr()); + } return Lit && Lit->getValue() == 0; } ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D61838: [Sema] Suppress additional warnings for C's zero initializer
al3xtjames added a comment. Such nested structures work fine (no warnings generated). Repository: rC Clang CHANGES SINCE LAST ACTION https://reviews.llvm.org/D61838/new/ https://reviews.llvm.org/D61838 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D61838: [Sema] Suppress additional warnings for C's zero initializer
al3xtjames added a comment. Thanks for reviewing! I don't have commit access, so I can't commit this patch myself. Repository: rC Clang CHANGES SINCE LAST ACTION https://reviews.llvm.org/D61838/new/ https://reviews.llvm.org/D61838 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D61838: [Sema] Suppress additional warnings for C's zero initializer
al3xtjames updated this revision to Diff 200159. al3xtjames added a comment. Switched to using Expr::IgnoreImplicit() instead of manually checking for an ImplicitCastExpression. Repository: rC Clang CHANGES SINCE LAST ACTION https://reviews.llvm.org/D61838/new/ https://reviews.llvm.org/D61838 Files: clang/lib/AST/Expr.cpp clang/test/Sema/zero-initializer.c Index: clang/test/Sema/zero-initializer.c === --- clang/test/Sema/zero-initializer.c +++ clang/test/Sema/zero-initializer.c @@ -7,6 +7,8 @@ struct B { struct A a; }; struct C { struct B b; }; struct D { struct C c; int n; }; +struct E { short e; }; +struct F { struct E e; int n; }; int main(void) { @@ -23,6 +25,9 @@ struct C p = { 0 }; // no-warning struct C q = { 9 }; // warning suppressed for struct with single element struct D r = { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + struct F s = { 0 }; // no-warning + struct F t = { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + f = (struct foo ) { 0 }; // no-warning g = (struct foo ) { 9 }; // expected-warning {{missing field 'y' initializer}} h = (struct foo ) { 9, 9 }; // no-warning @@ -36,6 +41,8 @@ p = (struct C) { 0 }; // no-warning q = (struct C) { 9 }; // warning suppressed for struct with single element r = (struct D) { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + s = (struct F) { 0 }; // no-warning + t = (struct F) { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} return 0; } Index: clang/lib/AST/Expr.cpp === --- clang/lib/AST/Expr.cpp +++ clang/lib/AST/Expr.cpp @@ -2175,7 +2175,7 @@ return false; } - const IntegerLiteral *Lit = dyn_cast(getInit(0)); + const IntegerLiteral *Lit = dyn_cast(getInit(0)->IgnoreImplicit()); return Lit && Lit->getValue() == 0; } Index: clang/test/Sema/zero-initializer.c === --- clang/test/Sema/zero-initializer.c +++ clang/test/Sema/zero-initializer.c @@ -7,6 +7,8 @@ struct B { struct A a; }; struct C { struct B b; }; struct D { struct C c; int n; }; +struct E { short e; }; +struct F { struct E e; int n; }; int main(void) { @@ -23,6 +25,9 @@ struct C p = { 0 }; // no-warning struct C q = { 9 }; // warning suppressed for struct with single element struct D r = { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + struct F s = { 0 }; // no-warning + struct F t = { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + f = (struct foo ) { 0 }; // no-warning g = (struct foo ) { 9 }; // expected-warning {{missing field 'y' initializer}} h = (struct foo ) { 9, 9 }; // no-warning @@ -36,6 +41,8 @@ p = (struct C) { 0 }; // no-warning q = (struct C) { 9 }; // warning suppressed for struct with single element r = (struct D) { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} + s = (struct F) { 0 }; // no-warning + t = (struct F) { 9 }; // expected-warning {{suggest braces around initialization of subobject}} expected-warning {{missing field 'n' initializer}} return 0; } Index: clang/lib/AST/Expr.cpp === --- clang/lib/AST/Expr.cpp +++ clang/lib/AST/Expr.cpp @@ -2175,7 +2175,7 @@ return false; } - const IntegerLiteral *Lit = dyn_cast(getInit(0)); + const IntegerLiteral *Lit = dyn_cast(getInit(0)->IgnoreImplicit()); return Lit && Lit->getValue() == 0; } ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D64651: [Driver] Support file paths with -ccc-gcc-name
al3xtjames updated this revision to Diff 306309. Repository: rC Clang CHANGES SINCE LAST ACTION https://reviews.llvm.org/D64651/new/ https://reviews.llvm.org/D64651 Files: clang/lib/Driver/ToolChains/Gnu.cpp Index: clang/lib/Driver/ToolChains/Gnu.cpp === --- clang/lib/Driver/ToolChains/Gnu.cpp +++ clang/lib/Driver/ToolChains/Gnu.cpp @@ -170,7 +170,12 @@ } else GCCName = "gcc"; - const char *Exec = Args.MakeArgString(getToolChain().GetProgramPath(GCCName)); + const char *Exec; + if (llvm::sys::fs::exists(GCCName)) +Exec = GCCName; + else +Exec = Args.MakeArgString(getToolChain().GetProgramPath(GCCName)); + C.addCommand(std::make_unique(JA, *this, ResponseFileSupport::AtFileCurCP(), Exec, CmdArgs, Inputs, Output)); Index: clang/lib/Driver/ToolChains/Gnu.cpp === --- clang/lib/Driver/ToolChains/Gnu.cpp +++ clang/lib/Driver/ToolChains/Gnu.cpp @@ -170,7 +170,12 @@ } else GCCName = "gcc"; - const char *Exec = Args.MakeArgString(getToolChain().GetProgramPath(GCCName)); + const char *Exec; + if (llvm::sys::fs::exists(GCCName)) +Exec = GCCName; + else +Exec = Args.MakeArgString(getToolChain().GetProgramPath(GCCName)); + C.addCommand(std::make_unique(JA, *this, ResponseFileSupport::AtFileCurCP(), Exec, CmdArgs, Inputs, Output)); ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits