Clean up and extend MLFuncBuilder to allow creating statements in the middle of a statement block. Rename Statement::getFunction() and StmtBlock()::getFunction() to findFunction() to make it clear that this is not a constant time getter.
Fix b/112039912 - we were recording 'i' instead of '%i' for loop induction variables causing "use of undefined SSA value" error.
PiperOrigin-RevId: 206884644
diff --git a/lib/Parser/Parser.cpp b/lib/Parser/Parser.cpp
index aa08cb6..0f4a3a5 100644
--- a/lib/Parser/Parser.cpp
+++ b/lib/Parser/Parser.cpp
@@ -1335,14 +1335,14 @@
return (emitError(useInfo.loc, "reference to invalid result number"),
nullptr);
+ // Otherwise, this is a forward reference. If we are in ML function return
+ // an error. In CFG function, create a placeholder and remember
+ // that we did so.
if (getKind() == Kind::MLFunc)
return (
emitError(useInfo.loc, "use of undefined SSA value " + useInfo.name),
nullptr);
- // Otherwise, this is a forward reference. If we are in ML function return
- // an error. In CFG function, create a placeholder and remember
- // that we did so.
auto *result = createForwardReferencePlaceholder(useInfo.loc, type);
entries[useInfo.number].first = result;
entries[useInfo.number].second = useInfo.loc;
@@ -2102,7 +2102,7 @@
return emitError("expected SSA identifier for the loop variable");
auto loc = getToken().getLoc();
- StringRef inductionVariableName = getTokenSpelling().drop_front();
+ StringRef inductionVariableName = getTokenSpelling();
consumeToken(Token::percent_identifier);
if (parseToken(Token::equal, "expected ="))
@@ -2143,6 +2143,8 @@
// Reset insertion point to the current block.
builder.setInsertionPoint(forStmt->getBlock());
+ // TODO: remove definition of the induction variable.
+
return ParseSuccess;
}