forked from OSchip/llvm-project
PR31631: fix bad CFG (and bogus warnings) when an if-statement has an init-statement and has binary operator as its condition.
llvm-svn: 291964
This commit is contained in:
parent
251099171f
commit
509bbd1a66
|
@ -2175,19 +2175,15 @@ CFGBlock *CFGBuilder::VisitIfStmt(IfStmt *I) {
|
||||||
SaveAndRestore<LocalScope::const_iterator> save_scope_pos(ScopePos);
|
SaveAndRestore<LocalScope::const_iterator> save_scope_pos(ScopePos);
|
||||||
|
|
||||||
// Create local scope for C++17 if init-stmt if one exists.
|
// Create local scope for C++17 if init-stmt if one exists.
|
||||||
if (Stmt *Init = I->getInit()) {
|
if (Stmt *Init = I->getInit())
|
||||||
LocalScope::const_iterator BeginScopePos = ScopePos;
|
|
||||||
addLocalScopeForStmt(Init);
|
addLocalScopeForStmt(Init);
|
||||||
addAutomaticObjDtors(ScopePos, BeginScopePos, I);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create local scope for possible condition variable.
|
// Create local scope for possible condition variable.
|
||||||
// Store scope position. Add implicit destructor.
|
// Store scope position. Add implicit destructor.
|
||||||
if (VarDecl *VD = I->getConditionVariable()) {
|
if (VarDecl *VD = I->getConditionVariable())
|
||||||
LocalScope::const_iterator BeginScopePos = ScopePos;
|
|
||||||
addLocalScopeForVarDecl(VD);
|
addLocalScopeForVarDecl(VD);
|
||||||
addAutomaticObjDtors(ScopePos, BeginScopePos, I);
|
|
||||||
}
|
addAutomaticObjDtors(ScopePos, save_scope_pos.get(), I);
|
||||||
|
|
||||||
// The block we were processing is now finished. Make it the successor
|
// The block we were processing is now finished. Make it the successor
|
||||||
// block.
|
// block.
|
||||||
|
@ -2256,36 +2252,39 @@ CFGBlock *CFGBuilder::VisitIfStmt(IfStmt *I) {
|
||||||
// removes infeasible paths from the control-flow graph by having the
|
// removes infeasible paths from the control-flow graph by having the
|
||||||
// control-flow transfer of '&&' or '||' go directly into the then/else
|
// control-flow transfer of '&&' or '||' go directly into the then/else
|
||||||
// blocks directly.
|
// blocks directly.
|
||||||
if (!I->getConditionVariable())
|
BinaryOperator *Cond =
|
||||||
if (BinaryOperator *Cond =
|
I->getConditionVariable()
|
||||||
dyn_cast<BinaryOperator>(I->getCond()->IgnoreParens()))
|
? nullptr
|
||||||
if (Cond->isLogicalOp())
|
: dyn_cast<BinaryOperator>(I->getCond()->IgnoreParens());
|
||||||
return VisitLogicalOperator(Cond, I, ThenBlock, ElseBlock).first;
|
CFGBlock *LastBlock;
|
||||||
|
if (Cond && Cond->isLogicalOp())
|
||||||
|
LastBlock = VisitLogicalOperator(Cond, I, ThenBlock, ElseBlock).first;
|
||||||
|
else {
|
||||||
|
// Now create a new block containing the if statement.
|
||||||
|
Block = createBlock(false);
|
||||||
|
|
||||||
// Now create a new block containing the if statement.
|
// Set the terminator of the new block to the If statement.
|
||||||
Block = createBlock(false);
|
Block->setTerminator(I);
|
||||||
|
|
||||||
// Set the terminator of the new block to the If statement.
|
// See if this is a known constant.
|
||||||
Block->setTerminator(I);
|
const TryResult &KnownVal = tryEvaluateBool(I->getCond());
|
||||||
|
|
||||||
// See if this is a known constant.
|
// Add the successors. If we know that specific branches are
|
||||||
const TryResult &KnownVal = tryEvaluateBool(I->getCond());
|
// unreachable, inform addSuccessor() of that knowledge.
|
||||||
|
addSuccessor(Block, ThenBlock, /* isReachable = */ !KnownVal.isFalse());
|
||||||
|
addSuccessor(Block, ElseBlock, /* isReachable = */ !KnownVal.isTrue());
|
||||||
|
|
||||||
// Add the successors. If we know that specific branches are
|
// Add the condition as the last statement in the new block. This may
|
||||||
// unreachable, inform addSuccessor() of that knowledge.
|
// create new blocks as the condition may contain control-flow. Any newly
|
||||||
addSuccessor(Block, ThenBlock, /* isReachable = */ !KnownVal.isFalse());
|
// created blocks will be pointed to be "Block".
|
||||||
addSuccessor(Block, ElseBlock, /* isReachable = */ !KnownVal.isTrue());
|
LastBlock = addStmt(I->getCond());
|
||||||
|
|
||||||
// Add the condition as the last statement in the new block. This may create
|
// If the IfStmt contains a condition variable, add it and its
|
||||||
// new blocks as the condition may contain control-flow. Any newly created
|
// initializer to the CFG.
|
||||||
// blocks will be pointed to be "Block".
|
if (const DeclStmt* DS = I->getConditionVariableDeclStmt()) {
|
||||||
CFGBlock *LastBlock = addStmt(I->getCond());
|
autoCreateBlock();
|
||||||
|
LastBlock = addStmt(const_cast<DeclStmt *>(DS));
|
||||||
// If the IfStmt contains a condition variable, add it and its
|
}
|
||||||
// initializer to the CFG.
|
|
||||||
if (const DeclStmt* DS = I->getConditionVariableDeclStmt()) {
|
|
||||||
autoCreateBlock();
|
|
||||||
LastBlock = addStmt(const_cast<DeclStmt *>(DS));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Finally, if the IfStmt contains a C++17 init-stmt, add it to the CFG.
|
// Finally, if the IfStmt contains a C++17 init-stmt, add it to the CFG.
|
||||||
|
@ -3078,19 +3077,15 @@ CFGBlock *CFGBuilder::VisitSwitchStmt(SwitchStmt *Terminator) {
|
||||||
SaveAndRestore<LocalScope::const_iterator> save_scope_pos(ScopePos);
|
SaveAndRestore<LocalScope::const_iterator> save_scope_pos(ScopePos);
|
||||||
|
|
||||||
// Create local scope for C++17 switch init-stmt if one exists.
|
// Create local scope for C++17 switch init-stmt if one exists.
|
||||||
if (Stmt *Init = Terminator->getInit()) {
|
if (Stmt *Init = Terminator->getInit())
|
||||||
LocalScope::const_iterator BeginScopePos = ScopePos;
|
|
||||||
addLocalScopeForStmt(Init);
|
addLocalScopeForStmt(Init);
|
||||||
addAutomaticObjDtors(ScopePos, BeginScopePos, Terminator);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create local scope for possible condition variable.
|
// Create local scope for possible condition variable.
|
||||||
// Store scope position. Add implicit destructor.
|
// Store scope position. Add implicit destructor.
|
||||||
if (VarDecl *VD = Terminator->getConditionVariable()) {
|
if (VarDecl *VD = Terminator->getConditionVariable())
|
||||||
LocalScope::const_iterator SwitchBeginScopePos = ScopePos;
|
|
||||||
addLocalScopeForVarDecl(VD);
|
addLocalScopeForVarDecl(VD);
|
||||||
addAutomaticObjDtors(ScopePos, SwitchBeginScopePos, Terminator);
|
|
||||||
}
|
addAutomaticObjDtors(ScopePos, save_scope_pos.get(), Terminator);
|
||||||
|
|
||||||
if (Block) {
|
if (Block) {
|
||||||
if (badCFG)
|
if (badCFG)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// RUN: %clang_cc1 -fsyntax-only -Wall -Wuninitialized -Wno-unused-value -Wno-unused-lambda-capture -std=c++11 -verify %s
|
// RUN: %clang_cc1 -fsyntax-only -Wall -Wuninitialized -Wno-unused-value -Wno-unused-lambda-capture -std=c++1z -verify %s
|
||||||
|
|
||||||
// definitions for std::move
|
// definitions for std::move
|
||||||
namespace std {
|
namespace std {
|
||||||
|
@ -1437,3 +1437,13 @@ void array_capture(bool b) {
|
||||||
[fname]{};
|
[fname]{};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void if_switch_init_stmt(int k) {
|
||||||
|
if (int n = 0; (n == k || k > 5)) {}
|
||||||
|
|
||||||
|
if (int n; (n == k || k > 5)) {} // expected-warning {{uninitialized}} expected-note {{initialize}}
|
||||||
|
|
||||||
|
switch (int n = 0; (n == k || k > 5)) {} // expected-warning {{boolean}}
|
||||||
|
|
||||||
|
switch (int n; (n == k || k > 5)) {} // expected-warning {{uninitialized}} expected-note {{initialize}} expected-warning {{boolean}}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue