[vmkit-commits] [vmkit] r129218 - in /vmkit/trunk: include/j3/JavaLLVMCompiler.h lib/J3/Compiler/JavaLLVMCompiler.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Sat Apr  9 12:22:23 2011
New Revision: 129218

URL: http://llvm.org/viewvc/llvm-project?rev=129218&view=rev
Log:
Update DIFactory -> DIBuilder after LLVM API change.


Modified:
    vmkit/trunk/include/j3/JavaLLVMCompiler.h
    vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp

Modified: vmkit/trunk/include/j3/JavaLLVMCompiler.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/JavaLLVMCompiler.h?rev=129218&r1=129217&r2=129218&view=diff
==============================================================================
--- vmkit/trunk/include/j3/JavaLLVMCompiler.h (original)
+++ vmkit/trunk/include/j3/JavaLLVMCompiler.h Sat Apr  9 12:22:23 2011
@@ -21,7 +21,7 @@
 
 namespace llvm {
   class BasicBlock;
-  class DIFactory;
+  class DIBuilder;
 }
 
 namespace j3 {
@@ -46,7 +46,7 @@
 
 protected:
   llvm::Module* TheModule;
-  llvm::DIFactory* DebugFactory;  
+  llvm::DIBuilder* DebugFactory;  
   J3Intrinsics JavaIntrinsics;
 
 private:  
@@ -82,7 +82,7 @@
   virtual void* GenerateStub(llvm::Function* F) = 0;
   void addJavaPasses();
   
-  llvm::DIFactory* getDebugFactory() {
+  llvm::DIBuilder* getDebugFactory() {
     return DebugFactory;
   }
 

Modified: vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp?rev=129218&r1=129217&r2=129218&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp Sat Apr  9 12:22:23 2011
@@ -10,6 +10,7 @@
 #include "llvm/LLVMContext.h"
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
+#include "llvm/Analysis/DIBuilder.h"
 #include "llvm/Analysis/LoopPass.h"
 #include "llvm/Target/TargetData.h"
 
@@ -25,7 +26,7 @@
 
 JavaLLVMCompiler::JavaLLVMCompiler(const std::string& str) :
   TheModule(new llvm::Module(str, *(new LLVMContext()))),
-  DebugFactory(new DIFactory(*TheModule)),
+  DebugFactory(new DIBuilder(*TheModule)),
   JavaIntrinsics(TheModule) {
 
   enabledException = true;
@@ -88,10 +89,10 @@
 
 MDNode* JavaLLVMCompiler::GetDbgSubprogram(JavaMethod* meth) {
   if (getMethodInfo(meth)->getDbgSubprogram() == NULL) {
-    MDNode* node = DebugFactory->CreateSubprogram(DIDescriptor(), "", "",
-                                                  "", DIFile(), 0,
-                                                  DIType(), false,
-                                                  false);
+    MDNode* node = DebugFactory->createFunction(DIDescriptor(), "",
+                                                "", DIFile(), 0,
+                                                DIType(), false,
+                                                false);
     DbgInfos.insert(std::make_pair(node, meth));
     getMethodInfo(meth)->setDbgSubprogram(node);
   }