maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[mlir][Parser] Fix memory leak when failing to parse a forward declared block 

This commit fixes a failure edge case where we accidentally drop forward
declared blocks in the error case. This allows for running the
invalid.mlir test in asan mode now.

Fixes #51387

Differential Revision: https://reviews.llvm.org/D130132
This commit is contained in:
River Riddle 2022-07-19 16:12:02 -07:00
parent 17d9bdf460
commit c35a4f5804
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mlir/lib/AsmParser/Parser.cpp
View File

@ -2090,6 +2090,10 @@ ParseResult OperationParser::parseBlock(Block *&block) {
// only in the case of a successful parse. This ensures that the Block // only in the case of a successful parse. This ensures that the Block
// allocated is released if the parse fails and control returns early. // allocated is released if the parse fails and control returns early.
std::unique_ptr<Block> inflightBlock; std::unique_ptr<Block> inflightBlock;
auto cleanupOnFailure = llvm::make_scope_exit([&] {
if (inflightBlock)
inflightBlock->dropAllDefinedValueUses();
});
// If a block has yet to be set, this is a new definition. If the caller // If a block has yet to be set, this is a new definition. If the caller
// provided a block, use it. Otherwise create a new one. // provided a block, use it. Otherwise create a new one.
@ -2107,25 +2111,31 @@ ParseResult OperationParser::parseBlock(Block *&block) {
// was already defined. // was already defined.
} else if (!eraseForwardRef(blockAndLoc.block)) { } else if (!eraseForwardRef(blockAndLoc.block)) {
return emitError(nameLoc, "redefinition of block '") << name << "'"; return emitError(nameLoc, "redefinition of block '") << name << "'";
} else {
// This was a forward reference block that is now floating. Keep track of it
// as inflight in case of error, so that it gets cleaned up properly.
inflightBlock.reset(blockAndLoc.block);
} }
// Populate the high level assembly state if necessary. // Populate the high level assembly state if necessary.
if (state.asmState) if (state.asmState)
state.asmState->addDefinition(blockAndLoc.block, nameLoc); state.asmState->addDefinition(blockAndLoc.block, nameLoc);
block = blockAndLoc.block; block = blockAndLoc.block;
// If an argument list is present, parse it. // If an argument list is present, parse it.
if (getToken().is(Token::l_paren)) if (getToken().is(Token::l_paren))
if (parseOptionalBlockArgList(block)) if (parseOptionalBlockArgList(block))
return failure(); return failure();
if (parseToken(Token::colon, "expected ':' after block name")) if (parseToken(Token::colon, "expected ':' after block name"))
return failure(); return failure();
// Parse the body of the block.
ParseResult res = parseBlockBody(block); ParseResult res = parseBlockBody(block);
// If parsing was successful, drop the inflight block. We relinquish ownership
// back up to the caller.
if (succeeded(res)) if (succeeded(res))
inflightBlock.release(); (void)inflightBlock.release();
return res; return res;
} }

4
mlir/test/IR/invalid.mlir
View File

@ -1,10 +1,6 @@
// RUN: mlir-opt -allow-unregistered-dialect %s -split-input-file -verify-diagnostics // RUN: mlir-opt -allow-unregistered-dialect %s -split-input-file -verify-diagnostics
// See http://llvm.org/pr52045
// UNSUPPORTED: asan
// Check different error cases. // Check different error cases.
// -----
func.func @bad_branch() { func.func @bad_branch() {
^bb12: ^bb12: