commit c561199a8bb39386b07bd6960fe5b85970cc0856
author Shih-wei Liao <sliao@google.com> Sun May 09 06:37:55 2010 -0700
committer Shih-wei Liao <sliao@google.com> Sun May 09 06:37:55 2010 -0700
tree 9453e8e30553bc2b53a1b2529bbc8540603dee56
parent be5c5310a8096458709d13b2348d00bb24d1eb89

mError

Change-Id: I29399bbfa3b4b8cabb6caf64f5f3121727b17583

bcc.cpp

diff --git a/bcc.cpp b/bcc.cpp
index 1a561c2..c092f86 100644
--- a/bcc.cpp
+++ b/bcc.cpp
@@ -250,8 +250,6 @@
   static std::string Triple;
 
   static llvm::CodeGenOpt::Level CodeGenOptLevel;
-
-  static std::string mError;
   /*
    * End of section of GlobalInitializing variables
    **********************************************/
@@ -273,9 +271,7 @@
 
   static void GlobalInitialization() {
     if(GlobalInitialized) return;
-    LOGE("INIT");
 
-    llvm::install_fatal_error_handler(LLVMErrorHandler, &mError);
     //    if (!llvm::llvm_is_multithreaded())
     //      llvm::llvm_start_multithreaded();
 
@@ -387,6 +383,8 @@
   static const llvm::StringRef ExportFuncMetadataName;
 
  private:
+  std::string mError;
+
   inline bool hasError() const {
     return !mError.empty();
   }
@@ -2553,6 +2551,8 @@
     mContext(NULL),
     mModule(NULL)
   {
+    llvm::remove_fatal_error_handler();
+    llvm::install_fatal_error_handler(LLVMErrorHandler, &mError);
     mContext = new llvm::LLVMContext();
     return;
   }
@@ -2569,7 +2569,7 @@
 
     if(bitcode == NULL || bitcodeSize <= 0)
       return 0;
-    LOGE("Before Init");
+
     GlobalInitialization();
 
     /* Package input to object MemoryBuffer */
@@ -2582,7 +2582,7 @@
 
     /* Read the input Bitcode as a Module */
     mModule = llvm::ParseBitcodeFile(SB, *mContext, &mError);
-    LOGE("FINISH LOAD");
+
 on_bcc_load_module_error:
     if (SB)
       delete SB;
@@ -2604,7 +2604,6 @@
     const llvm::NamedMDNode* ExportVarMetadata;
     const llvm::NamedMDNode* ExportFuncMetadata;
 
-    LOGE("mModule=%x", mModule);
     if(mModule == NULL) /* No module was loaded */
       return 0;
 
@@ -2907,8 +2906,6 @@
 
 std::vector<std::string> Compiler::Features;
 
-std::string Compiler::mError;
-
 /*
  * The named of metadata node that pragma resides
  * (should be synced with slang.cpp)