Revert MSVC 2017 build fix and fix it by moving the method that implicitly instantiates addPredicate out of line
Revert MSVC 2017 build fix and fix it by moving the method that implicitly instantiates addPredicate out of line

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@315932 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit e343d44e38db88d30a67598be539a1a599bdf416)

Conflicts:
      utils/TableGen/GlobalISelEmitter.cpp

apple/swift-llvm,apple/swift-llvm,apple/swift-llvm,apple/swift-llvm,apple/swift-llvm,apple/swift-llvm,apple/swift-llvm,apple/swift-llvm