From c92b8ea8d7b95f80bd3c55c925d1a5fc6a918039 Mon Sep 17 00:00:00 2001
From: Bo-Yuan Huang <byhuang1992@gmail.com>
Date: Mon, 24 Aug 2020 11:04:57 -0400
Subject: [PATCH] Reorder template concretization for type deduction in clang

---
 src/ila-mngr/u_unroller_smt.cc | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/ila-mngr/u_unroller_smt.cc b/src/ila-mngr/u_unroller_smt.cc
index 5665da204..5bdeff788 100644
--- a/src/ila-mngr/u_unroller_smt.cc
+++ b/src/ila-mngr/u_unroller_smt.cc
@@ -71,16 +71,16 @@ UnrollerSmt<Generator>::UnrollWithStepsUnconnected_(const size_t& len,
   return smt_gen_.GetShimExpr(nullptr, "");
 }
 
-//
-// PathUnroller
-//
-
 // Concretize SMT generators
-template class PathUnroller<Z3ExprAdapter>;
+template class UnrollerSmt<Z3ExprAdapter>;
 #ifdef SMTSWITCH_INTERFACE
-template class PathUnroller<SmtSwitchItf>;
+template class UnrollerSmt<SmtSwitchItf>;
 #endif // SMTSWITCH_INTERFACE
 
+//
+// PathUnroller
+//
+
 template <class Generator> void PathUnroller<Generator>::SetDecidingVars() {
   ExprSet unique_vars;
   for (const auto& instr : seq_) {
@@ -116,4 +116,10 @@ void PathUnroller<Generator>::MakeOneTransition(const size_t& idx) {
   this->assert_holder_.push_back(decode);
 }
 
+// Concretize SMT generators
+template class PathUnroller<Z3ExprAdapter>;
+#ifdef SMTSWITCH_INTERFACE
+template class PathUnroller<SmtSwitchItf>;
+#endif // SMTSWITCH_INTERFACE
+
 } // namespace ilang