[analyzer] Moved static Context to class member

[mikhail.ramalho]

Summary

Although it is a big patch, the changes are simple:

1. There is one Z3_Context now, member of the SMTConstraintManager class.
2. Z3Expr, Z3Sort, Z3Model and Z3Solver are constructed with a reference to the Z3_Context in SMTConstraintManager.
3. All static functions are now members of Z3Solver, e.g, the SMTConstraintManager now calls Solver.fromBoolean(false) instead of Z3Expr::fromBoolean(false).

Most of the patch only move stuff around except:

1. New method Z3Sort MkSort(const QualType &Ty, unsigned BitWidth), that creates a sort based on the QualType and its width. Used to simplify the fromData method.

Unfortunate consequence of this patch:

1. getInterpretation was moved from Z3Model class to Z3Solver, because it needs to create a Z3Sort before returning the interpretation. This can be fixed by changing both toAPFloat and toAPSInt by removing the dependency of Z3Sort (it's only used to check which Sort was created and to retrieve the type width).

[george.karpenkov]

lib/StaticAnalyzer/Core/Z3ConstraintManager.cpp

944–946

This line is redundant

[mikhail.ramalho]

Removed redundant line.

The code is still crashing. For some reason, SMTConstraintManager's constructor creates a temporary Z3Context and destroys it.

[NoQ]

SMTContext::getContext() returns the context by value, which means making a copy. It should return by reference.

[NoQ]

Mm, wait, nvm, it's a pointer.

[NoQ]

Z3Solver takes Z3Context by value, but then stores a reference. It should take it by reference.

[mikhail.ramalho]

In D49236#1160540, @NoQ wrote:

Z3Solver takes Z3Context by value, but then stores a reference. It should take it by reference.

Yes! Thank you!

[mikhail.ramalho]

Fixed constructor of Z3Expr, Z3Sort, Z3Model and Z3Solver not taking the reference to the Z3Context.

It's still crashing, due to the removal of castAPSInt. Investigating now.

[mikhail.ramalho]

Migrated cast methods.

[george.karpenkov]

lib/StaticAnalyzer/Core/Z3ConstraintManager.cpp

938

I'm not sure whether this is a right ownership model.
Constraint manager conceptually represents a solver, right?
Then could we make the Z3Solver non-mutable, have Z3Context live at the level above (one per application) and pass it by reference to the Z3ConstraintManager constructor?

[mikhail.ramalho]

lib/StaticAnalyzer/Core/Z3ConstraintManager.cpp

938

I don't know how changing the Z3ConstraintManager constructor would work with the rest of the CSA. The analyzer expects the constraint manager to be created using (Analyses.def:25 ):

std::unique_ptr<ConstraintManager>
ento::CreateZ3ConstraintManager(ProgramStateManager &StMgr, SubEngine *Eng)

and it's expected to be in the form (ProgramState.h:42):

typedef std::unique_ptr<ConstraintManager>(*ConstraintManagerCreator)(
    ProgramStateManager &, SubEngine *);

A pointer to the function that creates the constraint manager (CreateZ3ConstraintManager if -analyzer-constraints=z3 or CreateRangeConstraintManager if -analyzer-constraints=range) and eventually gets invoked in ProgramStateManager's constructor:

ProgramStateManager::ProgramStateManager(ASTContext &Ctx,
                                         StoreManagerCreator CreateSMgr,
                                         ConstraintManagerCreator CreateCMgr,
                                         llvm::BumpPtrAllocator &alloc,
                                         SubEngine *SubEng)
  : Eng(SubEng), EnvMgr(alloc), GDMFactory(alloc),
    svalBuilder(createSimpleSValBuilder(alloc, Ctx, *this)),
    CallEventMgr(new CallEventManager(alloc)), Alloc(alloc) {
  StoreMgr = (*CreateSMgr)(*this);
  ConstraintMgr = (*CreateCMgr)(*this, SubEng);
}

Maybe we should keep the idea of one context on hold and focus on the reusable SAT cores for now?

[george.karpenkov]

Maybe we should keep the idea of one context on hold and focus on the reusable SAT cores for now?

Unfortunately no, it's crucial to reuse the same context for performance. In fact that's a much easier way to get there.

OK what about this: why not just decouple context and solver classes from constraint manager entirely?
Z3ConstraintManager can then create it's own context/solver.
Your visitor can use Z3Solver directly. Does that sound too complicated?

I mean, conceptually, you are not really using Z3ConstraintManager, as we are not replacing the solver with Z3, we are just using it for cross-checking.

[mikhail.ramalho]

In D49236#1165739, @george.karpenkov wrote:

Maybe we should keep the idea of one context on hold and focus on the reusable SAT cores for now?

Unfortunately no, it's crucial to reuse the same context for performance. In fact that's a much easier way to get there.

OK what about this: why not just decouple context and solver classes from constraint manager entirely?

Yeah, actually neither the SMTConstraintManager nor the Z3ConstraintManager need to know about the SMTContext, it can be moved to inside the Z3Solver class (or a generic SMTSolver).

Z3ConstraintManager can then create it's own context/solver.
Your visitor can use Z3Solver directly. Does that sound too complicated?

No, I think that's the way to go.

I mean, conceptually, you are not really using Z3ConstraintManager, as we are not replacing the solver with Z3, we are just using it for cross-checking.

Having a SMTSolver generic class seems like a good idea, specially if we want to implement other solvers in the future.

We can expose it to both the ConstraintManager and the RefutationManager through a createSMTSolver(SolverT ty), where SolverT is a enum of possible solvers. How about that? Obviously, it'll only have Z3 for now.

[mikhail.ramalho]

Updated given changes in D49233

[george.karpenkov]

I'm not 100% convinced that reference count is correct everywhere, but I guess OK if it's not crashing.

lib/StaticAnalyzer/Core/Z3ConstraintManager.cpp

70–71

should be a separate revision, but OK

243

I'm confused why in other move assignments you only decrement reference counts, but in this one you increment as well

[mikhail.ramalho]

lib/StaticAnalyzer/Core/Z3ConstraintManager.cpp

243

Yeah, I'm not quite sure what's the difference, it's there since the beginning.

In any case, we won't need all these constructors when the new API lands. I'll create a revision in the future to remove all the dead code from the backend.

lib/StaticAnalyzer/Core/Z3ConstraintManager.cpp

Z3Config() : Config(Z3_mk_config()) {
     Z3_set_param_value(Config, "timeout", "15000");
   }
 
   ~Z3Config() { Z3_del_config(Config); }
 }; // end class Z3Config
 
 class Z3Context : public SMTSolverContext<Z3_context> {
 public:
-  static Z3_context ZC;
-
   Z3Context() : SMTSolverContext<Z3_context>() {
     Context = Z3_mk_context_rc(Z3Config().Config);
-    ZC = Context;
   }
 
-  ~Z3Context() {
-    Z3_del_context(ZC);
+  virtual ~Z3Context() {
+    Z3_del_context(Context);
     Context = nullptr;
   }
 }; // end class Z3Context
 
 class Z3Sort {
   friend class Z3Expr;
+  friend class Z3Solver;
+
+  Z3Context &Context;
 
   Z3_sort Sort;
 
-  Z3Sort() : Sort(nullptr) {}
-  Z3Sort(Z3_sort ZS) : Sort(ZS) {
-    Z3_inc_ref(Z3Context::ZC, reinterpret_cast<Z3_ast>(Sort));
+  Z3Sort(Z3Context &C, Z3_sort ZS) : Context(C), Sort(ZS) {
+    Z3_inc_ref(Context.getContext(), reinterpret_cast<Z3_ast>(Sort));
   }
 
 public:
   /// Override implicit copy constructor for correct reference counting.
-  Z3Sort(const Z3Sort &Copy) : Sort(Copy.Sort) {
-    Z3_inc_ref(Z3Context::ZC, reinterpret_cast<Z3_ast>(Sort));
+  Z3Sort(const Z3Sort &Copy) : Context(Copy.Context), Sort(Copy.Sort) {
+    Z3_inc_ref(Context.getContext(), reinterpret_cast<Z3_ast>(Sort));
   }
 
   /// Provide move constructor
-  Z3Sort(Z3Sort &&Move) : Sort(nullptr) { *this = std::move(Move); }
+  Z3Sort(Z3Sort &&Move) : Context(Move.Context), Sort(nullptr) {
+    *this = std::move(Move);
+  }
 
   /// Provide move assignment constructor
   Z3Sort &operator=(Z3Sort &&Move) {
     if (this != &Move) {
       if (Sort)
-        Z3_dec_ref(Z3Context::ZC, reinterpret_cast<Z3_ast>(Sort));
+        Z3_dec_ref(Context.getContext(), reinterpret_cast<Z3_ast>(Sort));
       Sort = Move.Sort;
       Move.Sort = nullptr;
     }
     return *this;
   }
 
   ~Z3Sort() {
     if (Sort)
-      Z3_dec_ref(Z3Context::ZC, reinterpret_cast<Z3_ast>(Sort));
-  }
-
-  // Return a boolean sort.
-  static Z3Sort getBoolSort() { return Z3Sort(Z3_mk_bool_sort(Z3Context::ZC)); }
-
-  // Return an appropriate bitvector sort for the given bitwidth.
-  static Z3Sort getBitvectorSort(unsigned BitWidth) {
-    return Z3Sort(Z3_mk_bv_sort(Z3Context::ZC, BitWidth));
-  }
-
-  // Return an appropriate floating-point sort for the given bitwidth.
-  static Z3Sort getFloatSort(unsigned BitWidth) {
-    Z3_sort Sort;
-
-    switch (BitWidth) {
-    default:
-      llvm_unreachable("Unsupported floating-point bitwidth!");
-      break;
-    case 16:
-      Sort = Z3_mk_fpa_sort_16(Z3Context::ZC);
-      break;
-    case 32:
-      Sort = Z3_mk_fpa_sort_32(Z3Context::ZC);
-      break;
-    case 64:
-      Sort = Z3_mk_fpa_sort_64(Z3Context::ZC);
-      break;
-    case 128:
-      Sort = Z3_mk_fpa_sort_128(Z3Context::ZC);
-      break;
-    }
-    return Z3Sort(Sort);
-  }
-
-  // Return an appropriate sort for the given AST.
-  static Z3Sort getSort(Z3_ast AST) {
-    return Z3Sort(Z3_get_sort(Z3Context::ZC, AST));
+      Z3_dec_ref(Context.getContext(), reinterpret_cast<Z3_ast>(Sort));
   }
 
   Z3_sort_kind getSortKind() const {
-    return Z3_get_sort_kind(Z3Context::ZC, Sort);
+    return Z3_get_sort_kind(Context.getContext(), Sort);
   }
 
   unsigned getBitvectorSortSize() const {
     assert(getSortKind() == Z3_BV_SORT && "Not a bitvector sort!");
-    return Z3_get_bv_sort_size(Z3Context::ZC, Sort);
+    return Z3_get_bv_sort_size(Context.getContext(), Sort);
   }
 
   unsigned getFloatSortSize() const {
     assert(getSortKind() == Z3_FLOATING_POINT_SORT &&
            "Not a floating-point sort!");
-    return Z3_fpa_get_ebits(Z3Context::ZC, Sort) +
-           Z3_fpa_get_sbits(Z3Context::ZC, Sort);
+    return Z3_fpa_get_ebits(Context.getContext(), Sort) +
+           Z3_fpa_get_sbits(Context.getContext(), Sort);
   }
 
   bool operator==(const Z3Sort &Other) const {
-    return Z3_is_eq_sort(Z3Context::ZC, Sort, Other.Sort);
+    return Z3_is_eq_sort(Context.getContext(), Sort, Other.Sort);
   }
 
   Z3Sort &operator=(const Z3Sort &Move) {
-    Z3_inc_ref(Z3Context::ZC, reinterpret_cast<Z3_ast>(Move.Sort));
-    Z3_dec_ref(Z3Context::ZC, reinterpret_cast<Z3_ast>(Sort));
+    Z3_inc_ref(Context.getContext(), reinterpret_cast<Z3_ast>(Move.Sort));
+    Z3_dec_ref(Context.getContext(), reinterpret_cast<Z3_ast>(Sort));
     Sort = Move.Sort;
     return *this;
   }
 
   void print(raw_ostream &OS) const {
-    OS << Z3_sort_to_string(Z3Context::ZC, Sort);
+    OS << Z3_sort_to_string(Context.getContext(), Sort);
   }
 
   LLVM_DUMP_METHOD void dump() const { print(llvm::errs()); }
 }; // end class Z3Sort
 
 class Z3Expr {
   friend class Z3Model;
   friend class Z3Solver;
 
-  Z3_ast AST;
+  Z3Context &Context;
 
-  Z3Expr(Z3_ast ZA) : AST(ZA) { Z3_inc_ref(Z3Context::ZC, AST); }
+  Z3_ast AST;
 
-  // Return an appropriate floating-point rounding mode.
-  static Z3Expr getFloatRoundingMode() {
-    // TODO: Don't assume nearest ties to even rounding mode
-    return Z3Expr(Z3_mk_fpa_rne(Z3Context::ZC));
+  Z3Expr(Z3Context &C, Z3_ast ZA) : Context(C), AST(ZA) {
+    Z3_inc_ref(Context.getContext(), AST);
   }
 
   // Determine whether two float semantics are equivalent
   static bool areEquivalent(const llvm::fltSemantics &LHS,
                             const llvm::fltSemantics &RHS) {
     return (llvm::APFloat::semanticsPrecision(LHS) ==
             llvm::APFloat::semanticsPrecision(RHS)) &&
            (llvm::APFloat::semanticsMinExponent(LHS) ==
             llvm::APFloat::semanticsMinExponent(RHS)) &&
            (llvm::APFloat::semanticsMaxExponent(LHS) ==
             llvm::APFloat::semanticsMaxExponent(RHS)) &&
            (llvm::APFloat::semanticsSizeInBits(LHS) ==
             llvm::APFloat::semanticsSizeInBits(RHS));
   }
 
 public:
   /// Override implicit copy constructor for correct reference counting.
-  Z3Expr(const Z3Expr &Copy) : AST(Copy.AST) { Z3_inc_ref(Z3Context::ZC, AST); }
+  Z3Expr(const Z3Expr &Copy) : Context(Copy.Context), AST(Copy.AST) {
+    Z3_inc_ref(Context.getContext(), AST);
+  }
 
   /// Provide move constructor
-  Z3Expr(Z3Expr &&Move) : AST(nullptr) { *this = std::move(Move); }
+  Z3Expr(Z3Expr &&Move) : Context(Move.Context), AST(nullptr) {
+    *this = std::move(Move);
+  }
 
   /// Provide move assignment constructor
   Z3Expr &operator=(Z3Expr &&Move) {
     if (this != &Move) {
       if (AST)
-        Z3_dec_ref(Z3Context::ZC, AST);
+        Z3_dec_ref(Context.getContext(), AST);
       AST = Move.AST;
       Move.AST = nullptr;
     }
     return *this;
   }
 
   ~Z3Expr() {
     if (AST)
-      Z3_dec_ref(Z3Context::ZC, AST);
+      Z3_dec_ref(Context.getContext(), AST);
   }
 
   /// Get the corresponding IEEE floating-point type for a given bitwidth.
   static const llvm::fltSemantics &getFloatSemantics(unsigned BitWidth) {
     switch (BitWidth) {
     default:
       llvm_unreachable("Unsupported floating-point semantics!");
       break;
     case 16:
       return llvm::APFloat::IEEEhalf();
     case 32:
       return llvm::APFloat::IEEEsingle();
     case 64:
       return llvm::APFloat::IEEEdouble();
     case 128:
       return llvm::APFloat::IEEEquad();
     }
   }
 
+  void Profile(llvm::FoldingSetNodeID &ID) const {
+    ID.AddInteger(Z3_get_ast_hash(Context.getContext(), AST));
+  }
+
+  bool operator<(const Z3Expr &Other) const {
+    llvm::FoldingSetNodeID ID1, ID2;
+    Profile(ID1);
+    Other.Profile(ID2);
+    return ID1 < ID2;
+  }
+
+  /// Comparison of AST equality, not model equivalence.
+  bool operator==(const Z3Expr &Other) const {
+    assert(Z3_is_eq_sort(Context.getContext(),
+                         Z3_get_sort(Context.getContext(), AST),
+                         Z3_get_sort(Context.getContext(), Other.AST)) &&
+           "AST's must have the same sort");
+    return Z3_is_eq_ast(Context.getContext(), AST, Other.AST);
+  }
+
+  /// Override implicit move constructor for correct reference counting.
+  Z3Expr &operator=(const Z3Expr &Move) {
+    Z3_inc_ref(Context.getContext(), Move.AST);
+    Z3_dec_ref(Context.getContext(), AST);
+    AST = Move.AST;
+    return *this;
+  }
+
+  void print(raw_ostream &OS) const {
+    OS << Z3_ast_to_string(Context.getContext(), AST);
+  }
+
+  LLVM_DUMP_METHOD void dump() const { print(llvm::errs()); }
+}; // end class Z3Expr
+
+class Z3Model {
+  friend class Z3Solver;
+
+  Z3Context &Context;
+
+  Z3_model Model;
+
+public:
+  Z3Model(Z3Context &C, Z3_model ZM) : Context(C), Model(ZM) {
+    Z3_model_inc_ref(Context.getContext(), Model);
+  }
+
+  /// Override implicit copy constructor for correct reference counting.
+  Z3Model(const Z3Model &Copy) : Context(Copy.Context), Model(Copy.Model) {
+    Z3_model_inc_ref(Context.getContext(), Model);
+  }
+
+  /// Provide move constructor
+  Z3Model(Z3Model &&Move) : Context(Move.Context), Model(nullptr) {
+    *this = std::move(Move);
+  }
+
+  /// Provide move assignment constructor
+  Z3Model &operator=(Z3Model &&Move) {
+    if (this != &Move) {
+      if (Model)
+        Z3_model_dec_ref(Context.getContext(), Model);
+      Model = Move.Model;
+      Move.Model = nullptr;
+    }
+    return *this;
+  }
+
+  ~Z3Model() {
+    if (Model)
+      Z3_model_dec_ref(Context.getContext(), Model);
+  }
+
+  void print(raw_ostream &OS) const {
+    OS << Z3_model_to_string(Context.getContext(), Model);
+  }
+
+  LLVM_DUMP_METHOD void dump() const { print(llvm::errs()); }
+}; // end class Z3Model
+
+class Z3Solver {
+  friend class Z3ConstraintManager;
+
+  Z3Context &Context;
+
+  Z3_solver Solver;
+
+  Z3Solver(Z3Context &C, Z3_solver ZS) : Context(C), Solver(ZS) {
+    Z3_solver_inc_ref(Context.getContext(), Solver);
+  }
+
+public:
+  /// Override implicit copy constructor for correct reference counting.
+  Z3Solver(const Z3Solver &Copy) : Context(Copy.Context), Solver(Copy.Solver) {
+    Z3_solver_inc_ref(Context.getContext(), Solver);
+  }
+
+  /// Provide move constructor
+  Z3Solver(Z3Solver &&Move) : Context(Move.Context), Solver(nullptr) {
+    *this = std::move(Move);
+  }
+
+  /// Provide move assignment constructor
+  Z3Solver &operator=(Z3Solver &&Move) {
+    if (this != &Move) {
+      if (Solver)
+        Z3_solver_dec_ref(Context.getContext(), Solver);
+      Solver = Move.Solver;
+      Move.Solver = nullptr;
+    }
+    return *this;
+  }
+
+  ~Z3Solver() {
+    if (Solver)
+      Z3_solver_dec_ref(Context.getContext(), Solver);
+  }
+
+  /// Given a constraint, add it to the solver
+  void addConstraint(const Z3Expr &Exp) {
+    Z3_solver_assert(Context.getContext(), Solver, Exp.AST);
+  }
+
+  // Return a boolean sort.
+  Z3Sort getBoolSort() {
+    return Z3Sort(Context, Z3_mk_bool_sort(Context.getContext()));
+  }
+
+  // Return an appropriate bitvector sort for the given bitwidth.
+  Z3Sort getBitvectorSort(unsigned BitWidth) {
+    return Z3Sort(Context, Z3_mk_bv_sort(Context.getContext(), BitWidth));
+  }
+
+  // Return an appropriate floating-point sort for the given bitwidth.
+  Z3Sort getFloatSort(unsigned BitWidth) {
+    Z3_sort Sort;
+
+    switch (BitWidth) {
+    default:
+      llvm_unreachable("Unsupported floating-point bitwidth!");
+      break;
+    case 16:
+      Sort = Z3_mk_fpa_sort_16(Context.getContext());
+      break;
+    case 32:
+      Sort = Z3_mk_fpa_sort_32(Context.getContext());
+      break;
+    case 64:
+      Sort = Z3_mk_fpa_sort_64(Context.getContext());
+      break;
+    case 128:
+      Sort = Z3_mk_fpa_sort_128(Context.getContext());
+      break;
+    }
+    return Z3Sort(Context, Sort);
+  }
+
+  // Return an appropriate sort, given a QualType
+  Z3Sort MkSort(const QualType &Ty, unsigned BitWidth) {
+    if(Ty->isBooleanType())
+      return getBoolSort();
+
+    if(Ty->isRealFloatingType())
+      return getFloatSort(BitWidth);
+
+    return getBitvectorSort(BitWidth);
+  }
+
+  // Return an appropriate sort for the given AST.
+  Z3Sort getSort(Z3_ast AST) {
+    return Z3Sort(Context, Z3_get_sort(Context.getContext(), AST));
+  }
+
+  /// Given a program state, construct the logical conjunction and add it to
+  /// the solver
+  void addStateConstraints(ProgramStateRef State) {
+    // TODO: Don't add all the constraints, only the relevant ones
+    ConstraintZ3Ty CZ = State->get<ConstraintZ3>();
+    ConstraintZ3Ty::iterator I = CZ.begin(), IE = CZ.end();
+
+    // Construct the logical AND of all the constraints
+    if (I != IE) {
+      std::vector<Z3_ast> ASTs;
+
+      while (I != IE)
+        ASTs.push_back(I++->second.AST);
+
+      Z3Expr Conj = fromNBinOp(BO_LAnd, ASTs);
+      addConstraint(Conj);
+    }
+  }
+
+  // Return an appropriate floating-point rounding mode.
+  Z3Expr getFloatRoundingMode() {
+    // TODO: Don't assume nearest ties to even rounding mode
+    return Z3Expr(Context, Z3_mk_fpa_rne(Context.getContext()));
+  }
+
   /// Construct a Z3Expr from a unary operator, given a Z3_context.
-  static Z3Expr fromUnOp(const UnaryOperator::Opcode Op, const Z3Expr &Exp) {
+  Z3Expr fromUnOp(const UnaryOperator::Opcode Op, const Z3Expr &Exp) {
     Z3_ast AST;
 
     switch (Op) {
     default:
       llvm_unreachable("Unimplemented opcode");
       break;
 
     case UO_Minus:
-      AST = Z3_mk_bvneg(Z3Context::ZC, Exp.AST);
+      AST = Z3_mk_bvneg(Context.getContext(), Exp.AST);
       break;
 
     case UO_Not:
-      AST = Z3_mk_bvnot(Z3Context::ZC, Exp.AST);
+      AST = Z3_mk_bvnot(Context.getContext(), Exp.AST);
       break;
 
     case UO_LNot:
-      AST = Z3_mk_not(Z3Context::ZC, Exp.AST);
+      AST = Z3_mk_not(Context.getContext(), Exp.AST);
       break;
     }
 
-    return Z3Expr(AST);
+    return Z3Expr(Context, AST);
   }
 
   /// Construct a Z3Expr from a floating-point unary operator, given a
   /// Z3_context.
-  static Z3Expr fromFloatUnOp(const UnaryOperator::Opcode Op,
-                              const Z3Expr &Exp) {
+  Z3Expr fromFloatUnOp(const UnaryOperator::Opcode Op, const Z3Expr &Exp) {
     Z3_ast AST;
 
     switch (Op) {
     default:
       llvm_unreachable("Unimplemented opcode");
       break;
 
     case UO_Minus:
-      AST = Z3_mk_fpa_neg(Z3Context::ZC, Exp.AST);
+      AST = Z3_mk_fpa_neg(Context.getContext(), Exp.AST);
       break;
 
     case UO_LNot:
-      return Z3Expr::fromUnOp(Op, Exp);
+      return fromUnOp(Op, Exp);
     }
 
-    return Z3Expr(AST);
+    return Z3Expr(Context, AST);
   }
 
   /// Construct a Z3Expr from a n-ary binary operator.
-  static Z3Expr fromNBinOp(const BinaryOperator::Opcode Op,
-                           const std::vector<Z3_ast> &ASTs) {
+  Z3Expr fromNBinOp(const BinaryOperator::Opcode Op,
     Z3_ast AST;
 
     switch (Op) {
     default:
       llvm_unreachable("Unimplemented opcode");
       break;
 
     case BO_LAnd:
-      AST = Z3_mk_and(Z3Context::ZC, ASTs.size(), ASTs.data());
+      AST = Z3_mk_and(Context.getContext(), ASTs.size(), ASTs.data());
       break;
 
     case BO_LOr:
-      AST = Z3_mk_or(Z3Context::ZC, ASTs.size(), ASTs.data());
+      AST = Z3_mk_or(Context.getContext(), ASTs.size(), ASTs.data());
       break;
     }
 
-    return Z3Expr(AST);
+    return Z3Expr(Context, AST);
   }
 
   /// Construct a Z3Expr from a binary operator, given a Z3_context.
-  static Z3Expr fromBinOp(const Z3Expr &LHS, const BinaryOperator::Opcode Op,
-                          const Z3Expr &RHS, bool isSigned) {
+  Z3Expr fromBinOp(const Z3Expr &LHS, const BinaryOperator::Opcode Op,
     Z3_ast AST;
 
-    assert(Z3Sort::getSort(LHS.AST) == Z3Sort::getSort(RHS.AST) &&
+    assert(getSort(LHS.AST) == getSort(RHS.AST) &&
            "AST's must have the same sort!");
 
     switch (Op) {
     default:
       llvm_unreachable("Unimplemented opcode");
       break;
 
       // Multiplicative operators
     case BO_Mul:
-      AST = Z3_mk_bvmul(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = Z3_mk_bvmul(Context.getContext(), LHS.AST, RHS.AST);
       break;
     case BO_Div:
-      AST = isSigned ? Z3_mk_bvsdiv(Z3Context::ZC, LHS.AST, RHS.AST)
-                     : Z3_mk_bvudiv(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = isSigned ? Z3_mk_bvsdiv(Context.getContext(), LHS.AST, RHS.AST)
+                     : Z3_mk_bvudiv(Context.getContext(), LHS.AST, RHS.AST);
       break;
     case BO_Rem:
-      AST = isSigned ? Z3_mk_bvsrem(Z3Context::ZC, LHS.AST, RHS.AST)
-                     : Z3_mk_bvurem(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = isSigned ? Z3_mk_bvsrem(Context.getContext(), LHS.AST, RHS.AST)
+                     : Z3_mk_bvurem(Context.getContext(), LHS.AST, RHS.AST);
       break;
 
       // Additive operators
     case BO_Add:
-      AST = Z3_mk_bvadd(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = Z3_mk_bvadd(Context.getContext(), LHS.AST, RHS.AST);
       break;
     case BO_Sub:
-      AST = Z3_mk_bvsub(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = Z3_mk_bvsub(Context.getContext(), LHS.AST, RHS.AST);
       break;
 
       // Bitwise shift operators
     case BO_Shl:
-      AST = Z3_mk_bvshl(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = Z3_mk_bvshl(Context.getContext(), LHS.AST, RHS.AST);
       break;
     case BO_Shr:
-      AST = isSigned ? Z3_mk_bvashr(Z3Context::ZC, LHS.AST, RHS.AST)
-                     : Z3_mk_bvlshr(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = isSigned ? Z3_mk_bvashr(Context.getContext(), LHS.AST, RHS.AST)
+                     : Z3_mk_bvlshr(Context.getContext(), LHS.AST, RHS.AST);
       break;
 
       // Relational operators
     case BO_LT:
-      AST = isSigned ? Z3_mk_bvslt(Z3Context::ZC, LHS.AST, RHS.AST)
-                     : Z3_mk_bvult(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = isSigned ? Z3_mk_bvslt(Context.getContext(), LHS.AST, RHS.AST)
+                     : Z3_mk_bvult(Context.getContext(), LHS.AST, RHS.AST);
       break;
     case BO_GT:
-      AST = isSigned ? Z3_mk_bvsgt(Z3Context::ZC, LHS.AST, RHS.AST)
-                     : Z3_mk_bvugt(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = isSigned ? Z3_mk_bvsgt(Context.getContext(), LHS.AST, RHS.AST)
+                     : Z3_mk_bvugt(Context.getContext(), LHS.AST, RHS.AST);
       break;
     case BO_LE:
-      AST = isSigned ? Z3_mk_bvsle(Z3Context::ZC, LHS.AST, RHS.AST)
-                     : Z3_mk_bvule(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = isSigned ? Z3_mk_bvsle(Context.getContext(), LHS.AST, RHS.AST)
+                     : Z3_mk_bvule(Context.getContext(), LHS.AST, RHS.AST);
       break;
     case BO_GE:
-      AST = isSigned ? Z3_mk_bvsge(Z3Context::ZC, LHS.AST, RHS.AST)
-                     : Z3_mk_bvuge(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = isSigned ? Z3_mk_bvsge(Context.getContext(), LHS.AST, RHS.AST)
+                     : Z3_mk_bvuge(Context.getContext(), LHS.AST, RHS.AST);
       break;
 
       // Equality operators
     case BO_EQ:
-      AST = Z3_mk_eq(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = Z3_mk_eq(Context.getContext(), LHS.AST, RHS.AST);
       break;
     case BO_NE:
-      return Z3Expr::fromUnOp(UO_LNot,
-                              Z3Expr::fromBinOp(LHS, BO_EQ, RHS, isSigned));
+      return fromUnOp(UO_LNot, fromBinOp(LHS, BO_EQ, RHS, isSigned));
       break;
 
       // Bitwise operators
     case BO_And:
-      AST = Z3_mk_bvand(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = Z3_mk_bvand(Context.getContext(), LHS.AST, RHS.AST);
       break;
     case BO_Xor:
-      AST = Z3_mk_bvxor(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = Z3_mk_bvxor(Context.getContext(), LHS.AST, RHS.AST);
       break;
     case BO_Or:
-      AST = Z3_mk_bvor(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = Z3_mk_bvor(Context.getContext(), LHS.AST, RHS.AST);
       break;
 
       // Logical operators
     case BO_LAnd:
     case BO_LOr: {
       std::vector<Z3_ast> Args = {LHS.AST, RHS.AST};
-      return Z3Expr::fromNBinOp(Op, Args);
+      return fromNBinOp(Op, Args);
     }
     }
 
-    return Z3Expr(AST);
+    return Z3Expr(Context, AST);
   }
 
   /// Construct a Z3Expr from a special floating-point binary operator, given
   /// a Z3_context.
-  static Z3Expr fromFloatSpecialBinOp(const Z3Expr &LHS,
-                                      const BinaryOperator::Opcode Op,
-                                      const llvm::APFloat::fltCategory &RHS) {
+  Z3Expr fromFloatSpecialBinOp(const Z3Expr &LHS,
     Z3_ast AST;
 
     switch (Op) {
     default:
       llvm_unreachable("Unimplemented opcode");
       break;
 
       // Equality operators
     case BO_EQ:
       switch (RHS) {
       case llvm::APFloat::fcInfinity:
-        AST = Z3_mk_fpa_is_infinite(Z3Context::ZC, LHS.AST);
+        AST = Z3_mk_fpa_is_infinite(Context.getContext(), LHS.AST);
         break;
       case llvm::APFloat::fcNaN:
-        AST = Z3_mk_fpa_is_nan(Z3Context::ZC, LHS.AST);
+        AST = Z3_mk_fpa_is_nan(Context.getContext(), LHS.AST);
         break;
       case llvm::APFloat::fcNormal:
-        AST = Z3_mk_fpa_is_normal(Z3Context::ZC, LHS.AST);
+        AST = Z3_mk_fpa_is_normal(Context.getContext(), LHS.AST);
         break;
       case llvm::APFloat::fcZero:
-        AST = Z3_mk_fpa_is_zero(Z3Context::ZC, LHS.AST);
+        AST = Z3_mk_fpa_is_zero(Context.getContext(), LHS.AST);
         break;
       }
       break;
     case BO_NE:
-      return Z3Expr::fromFloatUnOp(
-          UO_LNot, Z3Expr::fromFloatSpecialBinOp(LHS, BO_EQ, RHS));
+      return fromFloatUnOp(UO_LNot, fromFloatSpecialBinOp(LHS, BO_EQ, RHS));
       break;
     }
 
-    return Z3Expr(AST);
+    return Z3Expr(Context, AST);
   }
 
   /// Construct a Z3Expr from a floating-point binary operator, given a
   /// Z3_context.
-  static Z3Expr fromFloatBinOp(const Z3Expr &LHS,
-                               const BinaryOperator::Opcode Op,
-                               const Z3Expr &RHS) {
+  Z3Expr fromFloatBinOp(const Z3Expr &LHS, const BinaryOperator::Opcode Op,
     Z3_ast AST;
 
-    assert(Z3Sort::getSort(LHS.AST) == Z3Sort::getSort(RHS.AST) &&
+    assert(getSort(LHS.AST) == getSort(RHS.AST) &&
            "AST's must have the same sort!");
 
     switch (Op) {
     default:
       llvm_unreachable("Unimplemented opcode");
       break;
 
       // Multiplicative operators
     case BO_Mul: {
-      Z3Expr RoundingMode = Z3Expr::getFloatRoundingMode();
-      AST = Z3_mk_fpa_mul(Z3Context::ZC, RoundingMode.AST, LHS.AST, RHS.AST);
+      Z3Expr RoundingMode = getFloatRoundingMode();
+      AST = Z3_mk_fpa_mul(Context.getContext(), RoundingMode.AST, LHS.AST,
+                          RHS.AST);
       break;
     }
     case BO_Div: {
-      Z3Expr RoundingMode = Z3Expr::getFloatRoundingMode();
-      AST = Z3_mk_fpa_div(Z3Context::ZC, RoundingMode.AST, LHS.AST, RHS.AST);
+      Z3Expr RoundingMode = getFloatRoundingMode();
+      AST = Z3_mk_fpa_div(Context.getContext(), RoundingMode.AST, LHS.AST,
+                          RHS.AST);
       break;
     }
     case BO_Rem:
-      AST = Z3_mk_fpa_rem(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = Z3_mk_fpa_rem(Context.getContext(), LHS.AST, RHS.AST);
       break;
 
       // Additive operators
     case BO_Add: {
-      Z3Expr RoundingMode = Z3Expr::getFloatRoundingMode();
-      AST = Z3_mk_fpa_add(Z3Context::ZC, RoundingMode.AST, LHS.AST, RHS.AST);
+      Z3Expr RoundingMode = getFloatRoundingMode();
+      AST = Z3_mk_fpa_add(Context.getContext(), RoundingMode.AST, LHS.AST,
+                          RHS.AST);
       break;
     }
     case BO_Sub: {
-      Z3Expr RoundingMode = Z3Expr::getFloatRoundingMode();
-      AST = Z3_mk_fpa_sub(Z3Context::ZC, RoundingMode.AST, LHS.AST, RHS.AST);
+      Z3Expr RoundingMode = getFloatRoundingMode();
+      AST = Z3_mk_fpa_sub(Context.getContext(), RoundingMode.AST, LHS.AST,
+                          RHS.AST);
       break;
     }
 
       // Relational operators
     case BO_LT:
-      AST = Z3_mk_fpa_lt(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = Z3_mk_fpa_lt(Context.getContext(), LHS.AST, RHS.AST);
       break;
     case BO_GT:
-      AST = Z3_mk_fpa_gt(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = Z3_mk_fpa_gt(Context.getContext(), LHS.AST, RHS.AST);
       break;
     case BO_LE:
-      AST = Z3_mk_fpa_leq(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = Z3_mk_fpa_leq(Context.getContext(), LHS.AST, RHS.AST);
       break;
     case BO_GE:
-      AST = Z3_mk_fpa_geq(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = Z3_mk_fpa_geq(Context.getContext(), LHS.AST, RHS.AST);
       break;
 
       // Equality operators
     case BO_EQ:
-      AST = Z3_mk_fpa_eq(Z3Context::ZC, LHS.AST, RHS.AST);
+      AST = Z3_mk_fpa_eq(Context.getContext(), LHS.AST, RHS.AST);
       break;
     case BO_NE:
-      return Z3Expr::fromFloatUnOp(UO_LNot,
-                                   Z3Expr::fromFloatBinOp(LHS, BO_EQ, RHS));
+      return fromFloatUnOp(UO_LNot, fromFloatBinOp(LHS, BO_EQ, RHS));
       break;
 
       // Logical operators
     case BO_LAnd:
     case BO_LOr:
-      return Z3Expr::fromBinOp(LHS, Op, RHS, false);
+      return fromBinOp(LHS, Op, RHS, false);
     }
 
-    return Z3Expr(AST);
+    return Z3Expr(Context, AST);
   }
 
   /// Construct a Z3Expr from a SymbolData, given a Z3_context.
-  static Z3Expr fromData(const SymbolID ID, bool isBool, bool isFloat,
-                         uint64_t BitWidth) {
+  Z3Expr fromData(const SymbolID ID, const QualType &Ty, uint64_t BitWidth) {
     llvm::Twine Name = "$" + llvm::Twine(ID);
 
-    Z3Sort Sort;
-    if (isBool)
-      Sort = Z3Sort::getBoolSort();
-    else if (isFloat)
-      Sort = Z3Sort::getFloatSort(BitWidth);
-    else
-      Sort = Z3Sort::getBitvectorSort(BitWidth);
+    Z3Sort Sort = MkSort(Ty, BitWidth);
 
-    Z3_symbol Symbol = Z3_mk_string_symbol(Z3Context::ZC, Name.str().c_str());
-    Z3_ast AST = Z3_mk_const(Z3Context::ZC, Symbol, Sort.Sort);
-    return Z3Expr(AST);
+    Z3_symbol Symbol =
+        Z3_mk_string_symbol(Context.getContext(), Name.str().c_str());
+    Z3_ast AST = Z3_mk_const(Context.getContext(), Symbol, Sort.Sort);
+    return Z3Expr(Context, AST);
   }
 
   /// Construct a Z3Expr from a SymbolCast, given a Z3_context.
-  static Z3Expr fromCast(const Z3Expr &Exp, QualType ToTy, uint64_t ToBitWidth,
-                         QualType FromTy, uint64_t FromBitWidth) {
+  Z3Expr fromCast(const Z3Expr &Exp, QualType ToTy, uint64_t ToBitWidth,
     Z3_ast AST;
 
     if ((FromTy->isIntegralOrEnumerationType() &&
          ToTy->isIntegralOrEnumerationType()) ||
         (FromTy->isAnyPointerType() ^ ToTy->isAnyPointerType()) ||
         (FromTy->isBlockPointerType() ^ ToTy->isBlockPointerType()) ||
         (FromTy->isReferenceType() ^ ToTy->isReferenceType())) {
       // Special case: Z3 boolean type is distinct from bitvector type, so
       // must use if-then-else expression instead of direct cast
       if (FromTy->isBooleanType()) {
         assert(ToBitWidth > 0 && "BitWidth must be positive!");
-        Z3Expr Zero = Z3Expr::fromInt("0", ToBitWidth);
-        Z3Expr One = Z3Expr::fromInt("1", ToBitWidth);
-        AST = Z3_mk_ite(Z3Context::ZC, Exp.AST, One.AST, Zero.AST);
+        Z3Expr Zero = fromInt("0", ToBitWidth);
+        Z3Expr One = fromInt("1", ToBitWidth);
+        AST = Z3_mk_ite(Context.getContext(), Exp.AST, One.AST, Zero.AST);
       } else if (ToBitWidth > FromBitWidth) {
         AST = FromTy->isSignedIntegerOrEnumerationType()
-                  ? Z3_mk_sign_ext(Z3Context::ZC, ToBitWidth - FromBitWidth,
-                                   Exp.AST)
-                  : Z3_mk_zero_ext(Z3Context::ZC, ToBitWidth - FromBitWidth,
-                                   Exp.AST);
+                  ? Z3_mk_sign_ext(Context.getContext(),
+                                   ToBitWidth - FromBitWidth, Exp.AST)
+                  : Z3_mk_zero_ext(Context.getContext(),
+                                   ToBitWidth - FromBitWidth, Exp.AST);
       } else if (ToBitWidth < FromBitWidth) {
-        AST = Z3_mk_extract(Z3Context::ZC, ToBitWidth - 1, 0, Exp.AST);
+        AST = Z3_mk_extract(Context.getContext(), ToBitWidth - 1, 0, Exp.AST);
       } else {
         // Both are bitvectors with the same width, ignore the type cast
         return Exp;
       }
     } else if (FromTy->isRealFloatingType() && ToTy->isRealFloatingType()) {
       if (ToBitWidth != FromBitWidth) {
-        Z3Expr RoundingMode = Z3Expr::getFloatRoundingMode();
-        Z3Sort Sort = Z3Sort::getFloatSort(ToBitWidth);
-        AST = Z3_mk_fpa_to_fp_float(Z3Context::ZC, RoundingMode.AST, Exp.AST,
-                                    Sort.Sort);
+        Z3Expr RoundingMode = getFloatRoundingMode();
+        Z3Sort Sort = getFloatSort(ToBitWidth);
+        AST = Z3_mk_fpa_to_fp_float(Context.getContext(), RoundingMode.AST,
+                                    Exp.AST, Sort.Sort);
       } else {
         return Exp;
       }
     } else if (FromTy->isIntegralOrEnumerationType() &&
                ToTy->isRealFloatingType()) {
-      Z3Expr RoundingMode = Z3Expr::getFloatRoundingMode();
-      Z3Sort Sort = Z3Sort::getFloatSort(ToBitWidth);
-      AST = FromTy->isSignedIntegerOrEnumerationType()
-                ? Z3_mk_fpa_to_fp_signed(Z3Context::ZC, RoundingMode.AST,
-                                         Exp.AST, Sort.Sort)
-                : Z3_mk_fpa_to_fp_unsigned(Z3Context::ZC, RoundingMode.AST,
-                                           Exp.AST, Sort.Sort);
+      Z3Expr RoundingMode = getFloatRoundingMode();
+      Z3Sort Sort = getFloatSort(ToBitWidth);
+      AST =
+          FromTy->isSignedIntegerOrEnumerationType()
+              ? Z3_mk_fpa_to_fp_signed(Context.getContext(), RoundingMode.AST,
+              : Z3_mk_fpa_to_fp_unsigned(Context.getContext(), RoundingMode.AST,
     } else if (FromTy->isRealFloatingType() &&
                ToTy->isIntegralOrEnumerationType()) {
-      Z3Expr RoundingMode = Z3Expr::getFloatRoundingMode();
+      Z3Expr RoundingMode = getFloatRoundingMode();
       AST = ToTy->isSignedIntegerOrEnumerationType()
-                ? Z3_mk_fpa_to_sbv(Z3Context::ZC, RoundingMode.AST, Exp.AST,
-                                   ToBitWidth)
-                : Z3_mk_fpa_to_ubv(Z3Context::ZC, RoundingMode.AST, Exp.AST,
-                                   ToBitWidth);
+                ? Z3_mk_fpa_to_sbv(Context.getContext(), RoundingMode.AST,
+                                   Exp.AST, ToBitWidth)
+                : Z3_mk_fpa_to_ubv(Context.getContext(), RoundingMode.AST,
+                                   Exp.AST, ToBitWidth);
     } else {
       llvm_unreachable("Unsupported explicit type cast!");
     }
 
-    return Z3Expr(AST);
+    return Z3Expr(Context, AST);
   }
 
   /// Construct a Z3Expr from a boolean, given a Z3_context.
-  static Z3Expr fromBoolean(const bool Bool) {
-    Z3_ast AST = Bool ? Z3_mk_true(Z3Context::ZC) : Z3_mk_false(Z3Context::ZC);
-    return Z3Expr(AST);
+  Z3Expr fromBoolean(const bool Bool) {
+    Z3_ast AST = Bool ? Z3_mk_true(Context.getContext())
+                      : Z3_mk_false(Context.getContext());
+    return Z3Expr(Context, AST);
   }
 
   /// Construct a Z3Expr from a finite APFloat, given a Z3_context.
-  static Z3Expr fromAPFloat(const llvm::APFloat &Float) {
+  Z3Expr fromAPFloat(const llvm::APFloat &Float) {
     Z3_ast AST;
-    Z3Sort Sort = Z3Sort::getFloatSort(
-        llvm::APFloat::semanticsSizeInBits(Float.getSemantics()));
+    Z3Sort Sort =
+        getFloatSort(llvm::APFloat::semanticsSizeInBits(Float.getSemantics()));
 
     llvm::APSInt Int = llvm::APSInt(Float.bitcastToAPInt(), true);
-    Z3Expr Z3Int = Z3Expr::fromAPSInt(Int);
-    AST = Z3_mk_fpa_to_fp_bv(Z3Context::ZC, Z3Int.AST, Sort.Sort);
+    Z3Expr Z3Int = fromAPSInt(Int);
+    AST = Z3_mk_fpa_to_fp_bv(Context.getContext(), Z3Int.AST, Sort.Sort);
 
-    return Z3Expr(AST);
+    return Z3Expr(Context, AST);
   }
 
   /// Construct a Z3Expr from an APSInt, given a Z3_context.
-  static Z3Expr fromAPSInt(const llvm::APSInt &Int) {
-    Z3Sort Sort = Z3Sort::getBitvectorSort(Int.getBitWidth());
-    Z3_ast AST =
-        Z3_mk_numeral(Z3Context::ZC, Int.toString(10).c_str(), Sort.Sort);
-    return Z3Expr(AST);
+  Z3Expr fromAPSInt(const llvm::APSInt &Int) {
+    Z3Sort Sort = getBitvectorSort(Int.getBitWidth());
+    Z3_ast AST = Z3_mk_numeral(Context.getContext(), Int.toString(10).c_str(),
+                               Sort.Sort);
+    return Z3Expr(Context, AST);
   }
 
   /// Construct a Z3Expr from an integer, given a Z3_context.
-  static Z3Expr fromInt(const char *Int, uint64_t BitWidth) {
-    Z3Sort Sort = Z3Sort::getBitvectorSort(BitWidth);
-    Z3_ast AST = Z3_mk_numeral(Z3Context::ZC, Int, Sort.Sort);
-    return Z3Expr(AST);
+  Z3Expr fromInt(const char *Int, uint64_t BitWidth) {
+    Z3Sort Sort = getBitvectorSort(BitWidth);
+    Z3_ast AST = Z3_mk_numeral(Context.getContext(), Int, Sort.Sort);
+    return Z3Expr(Context, AST);
   }
 
   /// Construct an APFloat from a Z3Expr, given the AST representation
-  static bool toAPFloat(const Z3Sort &Sort, const Z3_ast &AST,
-                        llvm::APFloat &Float, bool useSemantics = true) {
+  bool toAPFloat(const Z3Sort &Sort, const Z3_ast &AST, llvm::APFloat &Float,
+                 bool useSemantics = true) {
     assert(Sort.getSortKind() == Z3_FLOATING_POINT_SORT &&
            "Unsupported sort to floating-point!");
 
     llvm::APSInt Int(Sort.getFloatSortSize(), true);
     const llvm::fltSemantics &Semantics =
         Z3Expr::getFloatSemantics(Sort.getFloatSortSize());
-    Z3Sort BVSort = Z3Sort::getBitvectorSort(Sort.getFloatSortSize());
-    if (!Z3Expr::toAPSInt(BVSort, AST, Int, true)) {
+    Z3Sort BVSort = getBitvectorSort(Sort.getFloatSortSize());
+    if (!toAPSInt(BVSort, AST, Int, true)) {
       return false;
     }
 
     if (useSemantics &&
         !Z3Expr::areEquivalent(Float.getSemantics(), Semantics)) {
       assert(false && "Floating-point types don't match!");
       return false;
     }
 
     Float = llvm::APFloat(Semantics, Int);
     return true;
   }
 
   /// Construct an APSInt from a Z3Expr, given the AST representation
-  static bool toAPSInt(const Z3Sort &Sort, const Z3_ast &AST, llvm::APSInt &Int,
-                       bool useSemantics = true) {
+  bool toAPSInt(const Z3Sort &Sort, const Z3_ast &AST, llvm::APSInt &Int,
     switch (Sort.getSortKind()) {
     default:
       llvm_unreachable("Unsupported sort to integer!");
     case Z3_BV_SORT: {
       if (useSemantics && Int.getBitWidth() != Sort.getBitvectorSortSize()) {
         assert(false && "Bitvector types don't match!");
         return false;
       }
 
       uint64_t Value[2];
       // Force cast because Z3 defines __uint64 to be a unsigned long long
       // type, which isn't compatible with a unsigned long type, even if they
       // are the same size.
-      Z3_get_numeral_uint64(Z3Context::ZC, AST,
+      Z3_get_numeral_uint64(Context.getContext(), AST,
                             reinterpret_cast<__uint64 *>(&Value[0]));
       if (Sort.getBitvectorSortSize() <= 64) {
         Int = llvm::APSInt(llvm::APInt(Int.getBitWidth(), Value[0]), true);
       } else if (Sort.getBitvectorSortSize() == 128) {
-        Z3Expr ASTHigh = Z3Expr(Z3_mk_extract(Z3Context::ZC, 127, 64, AST));
-        Z3_get_numeral_uint64(Z3Context::ZC, AST,
+        Z3Expr ASTHigh =
+            Z3Expr(Context, Z3_mk_extract(Context.getContext(), 127, 64, AST));
+        Z3_get_numeral_uint64(Context.getContext(), AST,
                               reinterpret_cast<__uint64 *>(&Value[1]));
         Int = llvm::APSInt(llvm::APInt(Int.getBitWidth(), Value), true);
       } else {
         assert(false && "Bitwidth not supported!");
         return false;
       }
       return true;
     }
     case Z3_BOOL_SORT:
       if (useSemantics && Int.getBitWidth() < 1) {
         assert(false && "Boolean type doesn't match!");
         return false;
       }
       Int = llvm::APSInt(
           llvm::APInt(Int.getBitWidth(),
-                      Z3_get_bool_value(Z3Context::ZC, AST) == Z3_L_TRUE ? 1
-                                                                         : 0),
+                      Z3_get_bool_value(Context.getContext(), AST) == Z3_L_TRUE
+                          ? 1
           true);
       return true;
     }
   }
 
-  void Profile(llvm::FoldingSetNodeID &ID) const {
-    ID.AddInteger(Z3_get_ast_hash(Z3Context::ZC, AST));
-  }
-
-  bool operator<(const Z3Expr &Other) const {
-    llvm::FoldingSetNodeID ID1, ID2;
-    Profile(ID1);
-    Other.Profile(ID2);
-    return ID1 < ID2;
-  }
-
-  /// Comparison of AST equality, not model equivalence.
-  bool operator==(const Z3Expr &Other) const {
-    assert(Z3_is_eq_sort(Z3Context::ZC, Z3_get_sort(Z3Context::ZC, AST),
-                         Z3_get_sort(Z3Context::ZC, Other.AST)) &&
-           "AST's must have the same sort");
-    return Z3_is_eq_ast(Z3Context::ZC, AST, Other.AST);
-  }
-
-  /// Override implicit move constructor for correct reference counting.
-  Z3Expr &operator=(const Z3Expr &Move) {
-    Z3_inc_ref(Z3Context::ZC, Move.AST);
-    Z3_dec_ref(Z3Context::ZC, AST);
-    AST = Move.AST;
-    return *this;
-  }
-
-  void print(raw_ostream &OS) const {
-    OS << Z3_ast_to_string(Z3Context::ZC, AST);
-  }
-
-  LLVM_DUMP_METHOD void dump() const { print(llvm::errs()); }
-}; // end class Z3Expr
-
-class Z3Model {
-  Z3_model Model;
-
-public:
-  Z3Model(Z3_model ZM) : Model(ZM) { Z3_model_inc_ref(Z3Context::ZC, Model); }
-
-  /// Override implicit copy constructor for correct reference counting.
-  Z3Model(const Z3Model &Copy) : Model(Copy.Model) {
-    Z3_model_inc_ref(Z3Context::ZC, Model);
-  }
-
-  /// Provide move constructor
-  Z3Model(Z3Model &&Move) : Model(nullptr) { *this = std::move(Move); }
-
-  /// Provide move assignment constructor
-  Z3Model &operator=(Z3Model &&Move) {
-    if (this != &Move) {
-      if (Model)
-        Z3_model_dec_ref(Z3Context::ZC, Model);
-      Model = Move.Model;
-      Move.Model = nullptr;
-    }
-    return *this;
-  }
-
-  ~Z3Model() {
-    if (Model)
-      Z3_model_dec_ref(Z3Context::ZC, Model);
-  }
-
-  /// Given an expression, extract the value of this operand in the model.
-  bool getInterpretation(const Z3Expr &Exp, llvm::APSInt &Int) const {
-    Z3_func_decl Func =
-        Z3_get_app_decl(Z3Context::ZC, Z3_to_app(Z3Context::ZC, Exp.AST));
-    if (Z3_model_has_interp(Z3Context::ZC, Model, Func) != Z3_L_TRUE)
+  /// Given an expression and a model, extract the value of this operand in
+  /// the model.
+  bool getInterpretation(const Z3Model Model, const Z3Expr &Exp,
+                         llvm::APSInt &Int) {
+    Z3_func_decl Func = Z3_get_app_decl(
+        Context.getContext(), Z3_to_app(Context.getContext(), Exp.AST));
+    if (Z3_model_has_interp(Context.getContext(), Model.Model, Func) !=
+        Z3_L_TRUE)
       return false;
 
-    Z3_ast Assign = Z3_model_get_const_interp(Z3Context::ZC, Model, Func);
-    Z3Sort Sort = Z3Sort::getSort(Assign);
-    return Z3Expr::toAPSInt(Sort, Assign, Int, true);
+    Z3_ast Assign =
+        Z3_model_get_const_interp(Context.getContext(), Model.Model, Func);
+    Z3Sort Sort = getSort(Assign);
+    return toAPSInt(Sort, Assign, Int, true);
   }
 
-  /// Given an expression, extract the value of this operand in the model.
-  bool getInterpretation(const Z3Expr &Exp, llvm::APFloat &Float) const {
-    Z3_func_decl Func =
-        Z3_get_app_decl(Z3Context::ZC, Z3_to_app(Z3Context::ZC, Exp.AST));
-    if (Z3_model_has_interp(Z3Context::ZC, Model, Func) != Z3_L_TRUE)
+  /// Given an expression and a model, extract the value of this operand in
+  /// the model.
+  bool getInterpretation(const Z3Model Model, const Z3Expr &Exp,
+                         llvm::APFloat &Float) {
+    Z3_func_decl Func = Z3_get_app_decl(
+        Context.getContext(), Z3_to_app(Context.getContext(), Exp.AST));
+    if (Z3_model_has_interp(Context.getContext(), Model.Model, Func) !=
+        Z3_L_TRUE)
       return false;
 
-    Z3_ast Assign = Z3_model_get_const_interp(Z3Context::ZC, Model, Func);
-    Z3Sort Sort = Z3Sort::getSort(Assign);
-    return Z3Expr::toAPFloat(Sort, Assign, Float, true);
-  }
-
-  void print(raw_ostream &OS) const {
-    OS << Z3_model_to_string(Z3Context::ZC, Model);
-  }
-
-  LLVM_DUMP_METHOD void dump() const { print(llvm::errs()); }
-}; // end class Z3Model
-
-class Z3Solver {
-  friend class Z3ConstraintManager;
-
-  Z3_solver Solver;
-
-  Z3Solver(Z3_solver ZS) : Solver(ZS) {
-    Z3_solver_inc_ref(Z3Context::ZC, Solver);
-  }
-
-public:
-  /// Override implicit copy constructor for correct reference counting.
-  Z3Solver(const Z3Solver &Copy) : Solver(Copy.Solver) {
-    Z3_solver_inc_ref(Z3Context::ZC, Solver);
-  }
-
-  /// Provide move constructor
-  Z3Solver(Z3Solver &&Move) : Solver(nullptr) { *this = std::move(Move); }
-
-  /// Provide move assignment constructor
-  Z3Solver &operator=(Z3Solver &&Move) {
-    if (this != &Move) {
-      if (Solver)
-        Z3_solver_dec_ref(Z3Context::ZC, Solver);
-      Solver = Move.Solver;
-      Move.Solver = nullptr;
-    }
-    return *this;
-  }
-
-  ~Z3Solver() {
-    if (Solver)
-      Z3_solver_dec_ref(Z3Context::ZC, Solver);
-  }
-
-  /// Given a constraint, add it to the solver
-  void addConstraint(const Z3Expr &Exp) {
-    Z3_solver_assert(Z3Context::ZC, Solver, Exp.AST);
-  }
-
-  /// Given a program state, construct the logical conjunction and add it to
-  /// the solver
-  void addStateConstraints(ProgramStateRef State) {
-    // TODO: Don't add all the constraints, only the relevant ones
-    ConstraintZ3Ty CZ = State->get<ConstraintZ3>();
-    ConstraintZ3Ty::iterator I = CZ.begin(), IE = CZ.end();
-
-    // Construct the logical AND of all the constraints
-    if (I != IE) {
-      std::vector<Z3_ast> ASTs;
-
-      while (I != IE)
-        ASTs.push_back(I++->second.AST);
-
-      Z3Expr Conj = Z3Expr::fromNBinOp(BO_LAnd, ASTs);
-      addConstraint(Conj);
-    }
+    Z3_ast Assign =
+        Z3_model_get_const_interp(Context.getContext(), Model.Model, Func);
+    Z3Sort Sort = getSort(Assign);
+    return toAPFloat(Sort, Assign, Float, true);
   }
 
   /// Check if the constraints are satisfiable
-  Z3_lbool check() { return Z3_solver_check(Z3Context::ZC, Solver); }
+  Z3_lbool check() { return Z3_solver_check(Context.getContext(), Solver); }
 
   /// Push the current solver state
-  void push() { return Z3_solver_push(Z3Context::ZC, Solver); }
+  void push() { return Z3_solver_push(Context.getContext(), Solver); }
 
   /// Pop the previous solver state
   void pop(unsigned NumStates = 1) {
-    assert(Z3_solver_get_num_scopes(Z3Context::ZC, Solver) >= NumStates);
-    return Z3_solver_pop(Z3Context::ZC, Solver, NumStates);
+    assert(Z3_solver_get_num_scopes(Context.getContext(), Solver) >= NumStates);
+    return Z3_solver_pop(Context.getContext(), Solver, NumStates);
   }
 
   /// Get a model from the solver. Caller should check the model is
   /// satisfiable.
   Z3Model getModel() {
-    return Z3Model(Z3_solver_get_model(Z3Context::ZC, Solver));
+    return Z3Model(Context, Z3_solver_get_model(Context.getContext(), Solver));
   }
 
   /// Reset the solver and remove all constraints.
-  void reset() { Z3_solver_reset(Z3Context::ZC, Solver); }
+  void reset() { Z3_solver_reset(Context.getContext(), Solver); }
 
   void print(raw_ostream &OS) const {
-    OS << Z3_solver_to_string(Z3Context::ZC, Solver);
+    OS << Z3_solver_to_string(Context.getContext(), Solver);
   }
 
   LLVM_DUMP_METHOD void dump() const { print(llvm::errs()); }
 }; // end class Z3Solver
 
 void Z3ErrorHandler(Z3_context Context, Z3_error_code Error) {
   llvm::report_fatal_error("Z3 error: " +
                            llvm::Twine(Z3_get_error_msg_ex(Context, Error)));
 }
 
 class Z3ConstraintManager : public SMTConstraintManager {
   Z3Context Context;
   mutable Z3Solver Solver;
 
 public:
   Z3ConstraintManager(SubEngine *SE, SValBuilder &SB)
       : SMTConstraintManager(SE, SB),
-        Solver(Z3_mk_simple_solver(Z3Context::ZC)) {
-    Z3_set_error_handler(Z3Context::ZC, Z3ErrorHandler);
+        Solver(Context,
+               Z3_mk_simple_solver(Context.getContext())) {
+    Z3_set_error_handler(Context.getContext(), Z3ErrorHandler);
   }
   //===------------------------------------------------------------------===//
   // Implementation for Refutation.
   //===------------------------------------------------------------------===//
 
   void addRangeConstraints(clang::ento::ConstraintRangeTy CR) override;
 
   ConditionTruthVal isModelFeasible() override;
private:
   // May modify all input parameters.
   // TODO: Refactor to use built-in conversion functions
   void doTypeConversion(Z3Expr &LHS, Z3Expr &RHS, QualType &LTy,
                         QualType &RTy) const;
 
   // Perform implicit integer type conversion.
   // May modify all input parameters.
   // TODO: Refactor to use Sema::handleIntegerConversion()
-  template <typename T,
-            T(doCast)(const T &, QualType, uint64_t, QualType, uint64_t)>
+  template <typename T>
   void doIntTypeConversion(T &LHS, QualType &LTy, T &RHS, QualType &RTy) const;
 
   // Perform implicit floating-point type conversion.
   // May modify all input parameters.
   // TODO: Refactor to use Sema::handleFloatConversion()
-  template <typename T,
-            T(doCast)(const T &, QualType, uint64_t, QualType, uint64_t)>
+  template <typename T>
   void doFloatTypeConversion(T &LHS, QualType &LTy, T &RHS,
                              QualType &RTy) const;
 
   // Callback function for doCast parameter on APSInt type.
   static llvm::APSInt castAPSInt(const llvm::APSInt &V, QualType ToTy,
                                  uint64_t ToWidth, QualType FromTy,
                                  uint64_t FromWidth);
 }; // end class Z3ConstraintManager
 
-Z3_context Z3Context::ZC;
-
 } // end anonymous namespace
 
 ProgramStateRef Z3ConstraintManager::assumeSym(ProgramStateRef State,
                                                SymbolRef Sym, bool Assumption) {
   QualType RetTy;
   bool hasComparison;
 
   Z3Expr Exp = getZ3Expr(Sym, &RetTy, &hasComparison);
if (const SymbolData *SD = dyn_cast<SymbolData>(Sym)) {
     Solver.addStateConstraints(State);
 
     // Constraints are unsatisfiable
     if (Solver.check() != Z3_L_TRUE)
       return nullptr;
 
     Z3Model Model = Solver.getModel();
     // Model does not assign interpretation
-    if (!Model.getInterpretation(Exp, Value))
+    if (!Solver.getInterpretation(Model, Exp, Value))
       return nullptr;
 
     // A value has been obtained, check if it is the only value
-    Z3Expr NotExp = Z3Expr::fromBinOp(
+    Z3Expr NotExp = Solver.fromBinOp(
         Exp, BO_NE,
-        Ty->isBooleanType() ? Z3Expr::fromBoolean(Value.getBoolValue())
-                            : Z3Expr::fromAPSInt(Value),
+        Ty->isBooleanType() ? Solver.fromBoolean(Value.getBoolValue())
+                            : Solver.fromAPSInt(Value),
         false);
 
     Solver.addConstraint(NotExp);
     if (Solver.check() == Z3_L_TRUE)
       return nullptr;
 
     // This is the only solution, store it
     return &BVF.getValue(Value);
if (const SymbolData *SD = dyn_cast<SymbolData>(Sym)) {
 
     if (!LHS || !RHS)
       return nullptr;
 
     llvm::APSInt ConvertedLHS, ConvertedRHS;
     QualType LTy, RTy;
     std::tie(ConvertedLHS, LTy) = fixAPSInt(*LHS);
     std::tie(ConvertedRHS, RTy) = fixAPSInt(*RHS);
-    doIntTypeConversion<llvm::APSInt, Z3ConstraintManager::castAPSInt>(
-        ConvertedLHS, LTy, ConvertedRHS, RTy);
     return BVF.evalAPSInt(BSE->getOpcode(), ConvertedLHS, ConvertedRHS);
   }
 
   llvm_unreachable("Unsupported expression to get symbol value!");
 }
 
 ProgramStateRef
 Z3ConstraintManager::removeDeadBindings(ProgramStateRef State,
                                         SymbolReaper &SymReaper) {
   ConstraintZ3Ty CZ = State->get<ConstraintZ3>();
   ConstraintZ3Ty::Factory &CZFactory = State->get_context<ConstraintZ3>();
 
   for (ConstraintZ3Ty::iterator I = CZ.begin(), E = CZ.end(); I != E; ++I) {
     if (SymReaper.maybeDead(I->first))
       CZ = CZFactory.remove(CZ, *I);
   }
 
   return State->set<ConstraintZ3>(CZ);
 }
 
 void Z3ConstraintManager::addRangeConstraints(ConstraintRangeTy CR) {
   for (const auto &I : CR) {
     SymbolRef Sym = I.first;
 
-    Z3Expr Constraints = Z3Expr::fromBoolean(false);
+    Z3Expr Constraints = Solver.fromBoolean(false);
     for (const auto &Range : I.second) {
       Z3Expr SymRange =
           getZ3RangeExpr(Sym, Range.From(), Range.To(), /*InRange=*/true);
 
       // FIXME: the last argument (isSigned) is not used when generating the
       // or expression, as both arguments are booleans
       Constraints =
-          Z3Expr::fromBinOp(Constraints, BO_LOr, SymRange, /*IsSigned=*/true);
+          Solver.fromBinOp(Constraints, BO_LOr, SymRange, /*IsSigned=*/true);
     }
     Solver.addConstraint(Constraints);
   }
 }
 
 clang::ento::ConditionTruthVal Z3ConstraintManager::isModelFeasible() {
   if (Solver.check() == Z3_L_FALSE)
     return false;
Z3Expr Z3ConstraintManager::getZ3Expr(SymbolRef Sym, QualType *RetTy,
   if (hasComparison) {
     *hasComparison = false;
   }
 
   return getZ3SymExpr(Sym, RetTy, hasComparison);
 }
 
 Z3Expr Z3ConstraintManager::getZ3NotExpr(const Z3Expr &Exp) const {
-  return Z3Expr::fromUnOp(UO_LNot, Exp);
+  return Solver.fromUnOp(UO_LNot, Exp);
 }
 
 Z3Expr Z3ConstraintManager::getZ3ZeroExpr(const Z3Expr &Exp, QualType Ty,
                                           bool Assumption) const {
   ASTContext &Ctx = getBasicVals().getContext();
   if (Ty->isRealFloatingType()) {
     llvm::APFloat Zero = llvm::APFloat::getZero(Ctx.getFloatTypeSemantics(Ty));
-    return Z3Expr::fromFloatBinOp(Exp, Assumption ? BO_EQ : BO_NE,
-                                  Z3Expr::fromAPFloat(Zero));
+    return Solver.fromFloatBinOp(Exp, Assumption ? BO_EQ : BO_NE,
+                                 Solver.fromAPFloat(Zero));
   } else if (Ty->isIntegralOrEnumerationType() || Ty->isAnyPointerType() ||
              Ty->isBlockPointerType() || Ty->isReferenceType()) {
     bool isSigned = Ty->isSignedIntegerOrEnumerationType();
     // Skip explicit comparison for boolean types
     if (Ty->isBooleanType())
       return Assumption ? getZ3NotExpr(Exp) : Exp;
-    return Z3Expr::fromBinOp(Exp, Assumption ? BO_EQ : BO_NE,
-                             Z3Expr::fromInt("0", Ctx.getTypeSize(Ty)),
-                             isSigned);
+    return Solver.fromBinOp(Exp, Assumption ? BO_EQ : BO_NE,
+                            Solver.fromInt("0", Ctx.getTypeSize(Ty)), isSigned);
   }
 
   llvm_unreachable("Unsupported type for zero value!");
 }
 
 Z3Expr Z3ConstraintManager::getZ3SymExpr(SymbolRef Sym, QualType *RetTy,
                                          bool *hasComparison) const {
   if (const SymbolData *SD = dyn_cast<SymbolData>(Sym)) {
Z3Expr Z3ConstraintManager::getZ3SymExpr(SymbolRef Sym, QualType *RetTy,
   }
 
   llvm_unreachable("Unsupported SymbolRef type!");
 }
 
 Z3Expr Z3ConstraintManager::getZ3DataExpr(const SymbolID ID,
                                           QualType Ty) const {
   ASTContext &Ctx = getBasicVals().getContext();
-  return Z3Expr::fromData(ID, Ty->isBooleanType(), Ty->isRealFloatingType(),
-                          Ctx.getTypeSize(Ty));
+  return Solver.fromData(ID, Ty, Ctx.getTypeSize(Ty));
 }
 
 Z3Expr Z3ConstraintManager::getZ3CastExpr(const Z3Expr &Exp, QualType FromTy,
                                           QualType ToTy) const {
   ASTContext &Ctx = getBasicVals().getContext();
-  return Z3Expr::fromCast(Exp, ToTy, Ctx.getTypeSize(ToTy), FromTy,
-                          Ctx.getTypeSize(FromTy));
+  return Solver.fromCast(Exp, ToTy, Ctx.getTypeSize(ToTy), FromTy,
 }
 
 Z3Expr Z3ConstraintManager::getZ3SymBinExpr(const BinarySymExpr *BSE,
                                             bool *hasComparison,
                                             QualType *RetTy) const {
   QualType LTy, RTy;
   BinaryOperator::Opcode Op = BSE->getOpcode();
 
   if (const SymIntExpr *SIE = dyn_cast<SymIntExpr>(BSE)) {
     Z3Expr LHS = getZ3SymExpr(SIE->getLHS(), &LTy, hasComparison);
     llvm::APSInt NewRInt;
     std::tie(NewRInt, RTy) = fixAPSInt(SIE->getRHS());
-    Z3Expr RHS = Z3Expr::fromAPSInt(NewRInt);
+    Z3Expr RHS = Solver.fromAPSInt(NewRInt);
     return getZ3BinExpr(LHS, LTy, Op, RHS, RTy, RetTy);
   } else if (const IntSymExpr *ISE = dyn_cast<IntSymExpr>(BSE)) {
     llvm::APSInt NewLInt;
     std::tie(NewLInt, LTy) = fixAPSInt(ISE->getLHS());
-    Z3Expr LHS = Z3Expr::fromAPSInt(NewLInt);
+    Z3Expr LHS = Solver.fromAPSInt(NewLInt);
     Z3Expr RHS = getZ3SymExpr(ISE->getRHS(), &RTy, hasComparison);
     return getZ3BinExpr(LHS, LTy, Op, RHS, RTy, RetTy);
   } else if (const SymSymExpr *SSM = dyn_cast<SymSymExpr>(BSE)) {
     Z3Expr LHS = getZ3SymExpr(SSM->getLHS(), &LTy, hasComparison);
     Z3Expr RHS = getZ3SymExpr(SSM->getRHS(), &RTy, hasComparison);
     return getZ3BinExpr(LHS, LTy, Op, RHS, RTy, RetTy);
   } else {
     llvm_unreachable("Unsupported BinarySymExpr type!");
if (RetTy) {
     // If the two operands are pointers and the operation is a subtraction, the
     // result is of type ptrdiff_t, which is signed
     if (LTy->isAnyPointerType() && RTy->isAnyPointerType() && Op == BO_Sub) {
       *RetTy = getBasicVals().getContext().getPointerDiffType();
     }
   }
 
   return LTy->isRealFloatingType()
-             ? Z3Expr::fromFloatBinOp(NewLHS, Op, NewRHS)
-             : Z3Expr::fromBinOp(NewLHS, Op, NewRHS,
-                                 LTy->isSignedIntegerOrEnumerationType());
+             ? Solver.fromFloatBinOp(NewLHS, Op, NewRHS)
+             : Solver.fromBinOp(NewLHS, Op, NewRHS,
 }
 
 Z3Expr Z3ConstraintManager::getZ3RangeExpr(SymbolRef Sym,
                                            const llvm::APSInt &From,
                                            const llvm::APSInt &To,
                                            bool InRange) {
   // Convert lower bound
   QualType FromTy;
   llvm::APSInt NewFromInt;
   std::tie(NewFromInt, FromTy) = fixAPSInt(From);
-  Z3Expr FromExp = Z3Expr::fromAPSInt(NewFromInt);
+  Z3Expr FromExp = Solver.fromAPSInt(NewFromInt);
 
   // Convert symbol
   QualType SymTy;
   Z3Expr Exp = getZ3Expr(Sym, &SymTy);
 
   // Construct single (in)equality
   if (From == To)
     return getZ3BinExpr(Exp, SymTy, InRange ? BO_EQ : BO_NE, FromExp, FromTy,
                         /*RetTy=*/nullptr);
 
   QualType ToTy;
   llvm::APSInt NewToInt;
   std::tie(NewToInt, ToTy) = fixAPSInt(To);
-  Z3Expr ToExp = Z3Expr::fromAPSInt(NewToInt);
+  Z3Expr ToExp = Solver.fromAPSInt(NewToInt);
   assert(FromTy == ToTy && "Range values have different types!");
 
   // Construct two (in)equalities, and a logical and/or
   Z3Expr LHS = getZ3BinExpr(Exp, SymTy, InRange ? BO_GE : BO_LT, FromExp,
                             FromTy, /*RetTy=*/nullptr);
   Z3Expr RHS = getZ3BinExpr(Exp, SymTy, InRange ? BO_LE : BO_GT, ToExp, ToTy,
                             /*RetTy=*/nullptr);
 
-  return Z3Expr::fromBinOp(LHS, InRange ? BO_LAnd : BO_LOr, RHS,
-                           SymTy->isSignedIntegerOrEnumerationType());
+  return Solver.fromBinOp(LHS, InRange ? BO_LAnd : BO_LOr, RHS,
 }
 
 //===------------------------------------------------------------------===//
 // Helper functions.
 //===------------------------------------------------------------------===//
 
 QualType Z3ConstraintManager::getAPSIntType(const llvm::APSInt &Int) const {
   ASTContext &Ctx = getBasicVals().getContext();
void Z3ConstraintManager::doTypeConversion(Z3Expr &LHS, Z3Expr &RHS,
                                            QualType &LTy, QualType &RTy) const {
   ASTContext &Ctx = getBasicVals().getContext();
 
   assert(!LTy.isNull() && !RTy.isNull() && "Input type is null!");
   // Perform type conversion
   if (LTy->isIntegralOrEnumerationType() &&
       RTy->isIntegralOrEnumerationType()) {
     if (LTy->isArithmeticType() && RTy->isArithmeticType())
-      return doIntTypeConversion<Z3Expr, Z3Expr::fromCast>(LHS, LTy, RHS, RTy);
+      return doIntTypeConversion<Z3Expr>(LHS, LTy, RHS, RTy);
   } else if (LTy->isRealFloatingType() || RTy->isRealFloatingType()) {
-    return doFloatTypeConversion<Z3Expr, Z3Expr::fromCast>(LHS, LTy, RHS, RTy);
+    return doFloatTypeConversion<Z3Expr>(LHS, LTy, RHS, RTy);
   } else if ((LTy->isAnyPointerType() || RTy->isAnyPointerType()) ||
              (LTy->isBlockPointerType() || RTy->isBlockPointerType()) ||
              (LTy->isReferenceType() || RTy->isReferenceType())) {
     // TODO: Refactor to Sema::FindCompositePointerType(), and
     // Sema::CheckCompareOperands().
 
     uint64_t LBitWidth = Ctx.getTypeSize(LTy);
     uint64_t RBitWidth = Ctx.getTypeSize(RTy);
 
     // Cast the non-pointer type to the pointer type.
     // TODO: Be more strict about this.
     if ((LTy->isAnyPointerType() ^ RTy->isAnyPointerType()) ||
         (LTy->isBlockPointerType() ^ RTy->isBlockPointerType()) ||
         (LTy->isReferenceType() ^ RTy->isReferenceType())) {
       if (LTy->isNullPtrType() || LTy->isBlockPointerType() ||
           LTy->isReferenceType()) {
-        LHS = Z3Expr::fromCast(LHS, RTy, RBitWidth, LTy, LBitWidth);
+        LHS = Solver.fromCast(LHS, RTy, RBitWidth, LTy, LBitWidth);
         LTy = RTy;
       } else {
-        RHS = Z3Expr::fromCast(RHS, LTy, LBitWidth, RTy, RBitWidth);
+        RHS = Solver.fromCast(RHS, LTy, LBitWidth, RTy, RBitWidth);
         RTy = LTy;
       }
     }
 
     // Cast the void pointer type to the non-void pointer type.
     // For void types, this assumes that the casted value is equal to the value
     // of the original pointer, and does not account for alignment requirements.
     if (LTy->isVoidPointerType() ^ RTy->isVoidPointerType()) {
if ((LTy.getCanonicalType() == RTy.getCanonicalType()) ||
       (LTy->isObjCObjectPointerType() && RTy->isObjCObjectPointerType())) {
     LTy = RTy;
     return;
   }
 
   // TODO: Refine behavior for invalid type casts
 }
 
-template <typename T,
-          T(doCast)(const T &, QualType, uint64_t, QualType, uint64_t)>
+template <typename T>
 void Z3ConstraintManager::doIntTypeConversion(T &LHS, QualType &LTy, T &RHS,
                                               QualType &RTy) const {
   ASTContext &Ctx = getBasicVals().getContext();
   uint64_t LBitWidth = Ctx.getTypeSize(LTy);
   uint64_t RBitWidth = Ctx.getTypeSize(RTy);
 
   assert(!LTy.isNull() && !RTy.isNull() && "Input type is null!");
   // Always perform integer promotion before checking type equality.
   // Otherwise, e.g. (bool) a + (bool) b could trigger a backend assertion
   if (LTy->isPromotableIntegerType()) {
     QualType NewTy = Ctx.getPromotedIntegerType(LTy);
     uint64_t NewBitWidth = Ctx.getTypeSize(NewTy);
-    LHS = (*doCast)(LHS, NewTy, NewBitWidth, LTy, LBitWidth);
+    LHS = Solver.fromCast(LHS, NewTy, NewBitWidth, LTy, LBitWidth);
     LTy = NewTy;
     LBitWidth = NewBitWidth;
   }
   if (RTy->isPromotableIntegerType()) {
     QualType NewTy = Ctx.getPromotedIntegerType(RTy);
     uint64_t NewBitWidth = Ctx.getTypeSize(NewTy);
-    RHS = (*doCast)(RHS, NewTy, NewBitWidth, RTy, RBitWidth);
+    RHS = Solver.fromCast(RHS, NewTy, NewBitWidth, RTy, RBitWidth);
     RTy = NewTy;
     RBitWidth = NewBitWidth;
   }
 
   if (LTy == RTy)
     return;
 
   // Perform integer type conversion
   // Note: Safe to skip updating bitwidth because this must terminate
   bool isLSignedTy = LTy->isSignedIntegerOrEnumerationType();
   bool isRSignedTy = RTy->isSignedIntegerOrEnumerationType();
 
   int order = Ctx.getIntegerTypeOrder(LTy, RTy);
   if (isLSignedTy == isRSignedTy) {
     // Same signedness; use the higher-ranked type
     if (order == 1) {
-      RHS = (*doCast)(RHS, LTy, LBitWidth, RTy, RBitWidth);
+      RHS = Solver.fromCast(RHS, LTy, LBitWidth, RTy, RBitWidth);
       RTy = LTy;
     } else {
-      LHS = (*doCast)(LHS, RTy, RBitWidth, LTy, LBitWidth);
+      LHS = Solver.fromCast(LHS, RTy, RBitWidth, LTy, LBitWidth);
       LTy = RTy;
     }
   } else if (order != (isLSignedTy ? 1 : -1)) {
     // The unsigned type has greater than or equal rank to the
     // signed type, so use the unsigned type
     if (isRSignedTy) {
-      RHS = (*doCast)(RHS, LTy, LBitWidth, RTy, RBitWidth);
+      RHS = Solver.fromCast(RHS, LTy, LBitWidth, RTy, RBitWidth);
       RTy = LTy;
     } else {
-      LHS = (*doCast)(LHS, RTy, RBitWidth, LTy, LBitWidth);
+      LHS = Solver.fromCast(LHS, RTy, RBitWidth, LTy, LBitWidth);
       LTy = RTy;
     }
   } else if (LBitWidth != RBitWidth) {
     // The two types are different widths; if we are here, that
     // means the signed type is larger than the unsigned type, so
     // use the signed type.
     if (isLSignedTy) {
-      RHS = (*doCast)(RHS, LTy, LBitWidth, RTy, RBitWidth);
+      RHS = Solver.fromCast(RHS, LTy, LBitWidth, RTy, RBitWidth);
       RTy = LTy;
     } else {
-      LHS = (*doCast)(LHS, RTy, RBitWidth, LTy, LBitWidth);
+      LHS = Solver.fromCast(LHS, RTy, RBitWidth, LTy, LBitWidth);
       LTy = RTy;
     }
   } else {
     // The signed type is higher-ranked than the unsigned type,
     // but isn't actually any bigger (like unsigned int and long
     // on most 32-bit systems).  Use the unsigned type corresponding
     // to the signed type.
     QualType NewTy = Ctx.getCorrespondingUnsignedType(isLSignedTy ? LTy : RTy);
-    RHS = (*doCast)(RHS, LTy, LBitWidth, RTy, RBitWidth);
+    RHS = Solver.fromCast(RHS, LTy, LBitWidth, RTy, RBitWidth);
     RTy = NewTy;
-    LHS = (*doCast)(LHS, RTy, RBitWidth, LTy, LBitWidth);
+    LHS = Solver.fromCast(LHS, RTy, RBitWidth, LTy, LBitWidth);
     LTy = NewTy;
   }
 }
 
-template <typename T,
-          T(doCast)(const T &, QualType, uint64_t, QualType, uint64_t)>
+template <typename T>
 void Z3ConstraintManager::doFloatTypeConversion(T &LHS, QualType &LTy, T &RHS,
                                                 QualType &RTy) const {
   ASTContext &Ctx = getBasicVals().getContext();
 
   uint64_t LBitWidth = Ctx.getTypeSize(LTy);
   uint64_t RBitWidth = Ctx.getTypeSize(RTy);
 
   // Perform float-point type promotion
   if (!LTy->isRealFloatingType()) {
-    LHS = (*doCast)(LHS, RTy, RBitWidth, LTy, LBitWidth);
+    LHS = Solver.fromCast(LHS, RTy, RBitWidth, LTy, LBitWidth);
     LTy = RTy;
     LBitWidth = RBitWidth;
   }
   if (!RTy->isRealFloatingType()) {
-    RHS = (*doCast)(RHS, LTy, LBitWidth, RTy, RBitWidth);
+    RHS = Solver.fromCast(RHS, LTy, LBitWidth, RTy, RBitWidth);
     RTy = LTy;
     RBitWidth = LBitWidth;
   }
 
   if (LTy == RTy)
     return;
 
   // If we have two real floating types, convert the smaller operand to the
   // bigger result
   // Note: Safe to skip updating bitwidth because this must terminate
   int order = Ctx.getFloatingTypeOrder(LTy, RTy);
   if (order > 0) {
-    RHS = Z3Expr::fromCast(RHS, LTy, LBitWidth, RTy, RBitWidth);
+    RHS = Solver.fromCast(RHS, LTy, LBitWidth, RTy, RBitWidth);
     RTy = LTy;
   } else if (order == 0) {
-    LHS = Z3Expr::fromCast(LHS, RTy, RBitWidth, LTy, LBitWidth);
+    LHS = Solver.fromCast(LHS, RTy, RBitWidth, LTy, LBitWidth);
     LTy = RTy;
   } else {
     llvm_unreachable("Unsupported floating-point type cast!");
   }
 }
 
 llvm::APSInt Z3ConstraintManager::castAPSInt(const llvm::APSInt &V,
                                              QualType ToTy, uint64_t ToWidth,