Skip to content

Commit

Permalink
[TableGen][GlobalISel] Reset the internal map of RuleMatchers just be…
Browse files Browse the repository at this point in the history
…fore the emission

Between the creation of the last InstructionMatcher and the first
emission of the related Rule, we need to clear the internal map of IDs.
We used to do that right after the creation of the main
InstructionMatcher when building the rule and although that worked, this
is fragile because if for some reason some later code decides to create
more InstructionMatcher before the final call to emit, then the IDs
would be completely messed up.

Move that to the beginning of "emit" so that the IDs are guarantee to be
consistent.

NFC.

llvm-svn: 321053
  • Loading branch information
Quentin Colombet committed Dec 19, 2017
1 parent 8516b7f commit 63a328c
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions llvm/utils/TableGen/GlobalISelEmitter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2346,6 +2346,10 @@ void RuleMatcher::emit(MatchTable &Table) {
if (Matchers.empty())
llvm_unreachable("Unexpected empty matcher!");

// Reset the ID generation so that the emitted IDs match the ones
// we set while building the InstructionMatcher and such.
clearImplicitMap();

// The representation supports rules that require multiple roots such as:
// %ptr(p0) = ...
// %elt0(s32) = G_LOAD %ptr
Expand Down Expand Up @@ -3352,9 +3356,6 @@ Expected<RuleMatcher> GlobalISelEmitter::runOnPattern(const PatternToMatch &P) {
unsigned TempOpIdx = 0;
auto InsnMatcherOrError =
createAndImportSelDAGMatcher(M, InsnMatcherTemp, Src, TempOpIdx);
// Reset the ID generation so that the emitted IDs match the ones
// in the InstructionMatcher and such.
M.clearImplicitMap();
if (auto Error = InsnMatcherOrError.takeError())
return std::move(Error);
InstructionMatcher &InsnMatcher = InsnMatcherOrError.get();
Expand Down

0 comments on commit 63a328c

Please sign in to comment.