[llvm-commits] CVS: llvm-java/lib/Compiler/Compiler.cpp

[Alkis Evlogimenos]

Changes in directory llvm-java/lib/Compiler:

Compiler.cpp updated: 1.278 -> 1.279
---
Log message:

Match types of runtime functions and structs. This allows again the
inlining of functions in the runtime.


---
Diffs of the changes:  (+6 -4)

 Compiler.cpp |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)


Index: llvm-java/lib/Compiler/Compiler.cpp
diff -u llvm-java/lib/Compiler/Compiler.cpp:1.278 llvm-java/lib/Compiler/Compiler.cpp:1.279
--- llvm-java/lib/Compiler/Compiler.cpp:1.278	Sat Apr  2 03:14:25 2005
+++ llvm-java/lib/Compiler/Compiler.cpp	Sat Apr  2 18:22:55 2005
@@ -82,18 +82,20 @@
                                       "llvm_java_JNIEnv",
                                       module_);
       const Type* classRecordPtrType = resolver_->getClassRecordPtrType();
+      const Type* objectBaseType = resolver_->getObjectBaseType();
+
       getClassRecord_ = module_->getOrInsertFunction(
         "llvm_java_get_class_record", classRecordPtrType,
-        resolver_->getObjectBaseType(), NULL);
+        objectBaseType, NULL);
       setClassRecord_ = module_->getOrInsertFunction(
         "llvm_java_set_class_record", Type::VoidTy,
-        resolver_->getObjectBaseType(), classRecordPtrType, NULL);
+        objectBaseType, classRecordPtrType, NULL);
       throw_ = module_->getOrInsertFunction(
         "llvm_java_throw", Type::IntTy,
-        resolver_->getObjectBaseType(), NULL);
+        objectBaseType, NULL);
       isInstanceOf_ = module_->getOrInsertFunction(
         "llvm_java_is_instance_of", Type::IntTy,
-        resolver_->getObjectBaseType(), classRecordPtrType, NULL);
+        objectBaseType, classRecordPtrType, NULL);
       memcpy_ = module_->getOrInsertFunction(
         "llvm.memcpy", Type::VoidTy,
         PointerType::get(Type::SByteTy),