From d4762e88fd43fca789ed2016305bd88eb3179aa9 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 14 Feb 2014 22:36:16 +0000 Subject: [PATCH] Add extern template instantiations of llvm::Calculate. This should be a small build time improvement in general and fixes the build on OS X with -DBUILD_SHARED_LIBS=ON. The issue is that not all users are including GenericDomTreeConstruction.h, causing undefined references when ld64 managed to hide the linkonce_odr symbols. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201440 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/IR/Dominators.h | 11 +++++++++++ lib/IR/Dominators.cpp | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/include/llvm/IR/Dominators.h b/include/llvm/IR/Dominators.h index 9090457bcf0..0faa3b886fe 100644 --- a/include/llvm/IR/Dominators.h +++ b/include/llvm/IR/Dominators.h @@ -34,6 +34,17 @@ namespace llvm { EXTERN_TEMPLATE_INSTANTIATION(class DomTreeNodeBase); EXTERN_TEMPLATE_INSTANTIATION(class DominatorTreeBase); +#define LLVM_COMMA , +EXTERN_TEMPLATE_INSTANTIATION( + void llvm::Calculate( + DominatorTreeBase::NodeType> &DT + LLVM_COMMA Function &F)); +EXTERN_TEMPLATE_INSTANTIATION(void llvm::Calculate< + Function LLVM_COMMA Inverse >(DominatorTreeBase< + typename GraphTraits >::NodeType> &DT LLVM_COMMA + Function &F)); +#undef LLVM_COMMA + typedef DomTreeNodeBase DomTreeNode; class BasicBlockEdge { diff --git a/lib/IR/Dominators.cpp b/lib/IR/Dominators.cpp index 8fa742f745a..baa6019098d 100644 --- a/lib/IR/Dominators.cpp +++ b/lib/IR/Dominators.cpp @@ -64,6 +64,16 @@ bool BasicBlockEdge::isSingleEdge() const { TEMPLATE_INSTANTIATION(class llvm::DomTreeNodeBase); TEMPLATE_INSTANTIATION(class llvm::DominatorTreeBase); +#define LLVM_COMMA , +TEMPLATE_INSTANTIATION(void llvm::Calculate( + DominatorTreeBase::NodeType> &DT + LLVM_COMMA Function &F)); +TEMPLATE_INSTANTIATION(void llvm::Calculate< + Function LLVM_COMMA Inverse >(DominatorTreeBase< + typename GraphTraits >::NodeType> &DT LLVM_COMMA + Function &F)); +#undef LLVM_COMMA + // dominates - Return true if Def dominates a use in User. This performs // the special checks necessary if Def and User are in the same basic block. // Note that Def doesn't dominate a use in Def itself! -- 2.34.1