From: Bill Wendling <isanbard@gmail.com>
Date: Wed, 5 Oct 2011 07:04:14 +0000 (+0000)
Subject: Also update the EH with bitcode. I missed this earlier. Thanks to Duncan for pointing... 
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=e9b88cb393fde367d803a57556a6f93c8345383c;p=oota-llvm.git

Also update the EH with bitcode. I missed this earlier. Thanks to Duncan for pointing it out.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@141169 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp
index ca903151629..46565f36af1 100644
--- a/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -2939,6 +2939,9 @@ bool BitcodeReader::MaterializeModule(Module *M, std::string *ErrInfo) {
   }
   std::vector<std::pair<Function*, Function*> >().swap(UpgradedIntrinsics);
 
+  // Upgrade to new EH scheme. N.B. This will go away in 3.1.
+  UpgradeExceptionHandling(M);
+
   // Check debug info intrinsics.
   CheckDebugInfoIntrinsics(TheModule);