[vmkit-commits] [vmkit] r137024 - in /vmkit/trunk: include/j3/J3Intrinsics.h lib/J3/Compiler/J3Intrinsics.cpp lib/J3/Compiler/JavaAOTCompiler.cpp lib/J3/Compiler/JavaJITCompiler.cpp lib/J3/LLVMRuntime/runtime-default.ll lib/J3/VMCore/JavaClass.cpp lib/J3/VMCore/JavaClass.h

[Nicolas Geoffray]

Author: geoffray
Date: Sat Aug  6 13:25:44 2011
New Revision: 137024

URL: http://llvm.org/viewvc/llvm-project?rev=137024&view=rev
Log:
Remove unused fields in JavaMethod.


Modified:
    vmkit/trunk/include/j3/J3Intrinsics.h
    vmkit/trunk/lib/J3/Compiler/J3Intrinsics.cpp
    vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
    vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp
    vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll
    vmkit/trunk/lib/J3/VMCore/JavaClass.cpp
    vmkit/trunk/lib/J3/VMCore/JavaClass.h

Modified: vmkit/trunk/include/j3/J3Intrinsics.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/J3Intrinsics.h?rev=137024&r1=137023&r2=137024&view=diff
==============================================================================
--- vmkit/trunk/include/j3/J3Intrinsics.h (original)
+++ vmkit/trunk/include/j3/J3Intrinsics.h Sat Aug  6 13:25:44 2011
@@ -40,7 +40,6 @@
   llvm::Type* ClassBytesType;
   llvm::Type* JavaConstantPoolType;
   llvm::Type* ResolvedConstantPoolType;
-  llvm::Type* CodeLineInfoType;
   llvm::Type* UTF8Type;
   llvm::Type* JavaMethodType;
   llvm::Type* JavaFieldType;

Modified: vmkit/trunk/lib/J3/Compiler/J3Intrinsics.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/J3Intrinsics.cpp?rev=137024&r1=137023&r2=137024&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/J3Intrinsics.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/J3Intrinsics.cpp Sat Aug  6 13:25:44 2011
@@ -95,9 +95,6 @@
   MutatorThreadType =
     PointerType::getUnqual(module->getTypeByName("MutatorThread"));
   
-  CodeLineInfoType =
-    PointerType::getUnqual(module->getTypeByName("CodeLineInfo"));
-  
   J3DenseMapType =
     PointerType::getUnqual(module->getTypeByName("J3DenseMap"));
   

Modified: vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp?rev=137024&r1=137023&r2=137024&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp Sat Aug  6 13:25:44 2011
@@ -1045,20 +1045,6 @@
                                                JavaIntrinsics.ptrType));
   }
   
-  // codeInfo
-  if (useCooperativeGC() && method.code != NULL) {
-    Twine name = getMethodInfo(&method)->getMethod()->getName() + "_frame";
-    GlobalVariable* frame = new GlobalVariable(
-        Mod, JavaIntrinsics.CodeLineInfoType->getContainedType(0), false,
-        GlobalValue::ExternalLinkage, NULL, name);
-    MethodElts.push_back(frame);
-  } else {
-    MethodElts.push_back(Constant::getNullValue(JavaIntrinsics.CodeLineInfoType));
-  }
-  
-  // codeInfoLength
-  MethodElts.push_back(ConstantInt::get(Type::getInt16Ty(getLLVMContext()), 0));
-
   // offset
   MethodElts.push_back(ConstantInt::get(Type::getInt32Ty(getLLVMContext()), method.offset));
 

Modified: vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp?rev=137024&r1=137023&r2=137024&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp Sat Aug  6 13:25:44 2011
@@ -312,7 +312,7 @@
     llvm::GCFunctionInfo& GFI = GCInfo->getFunctionInfo(*func);
   
     Jnjvm* vm = JavaThread::get()->getJVM();
-    meth->frames = mvm::MvmModule::addToVM(vm, &GFI, (JIT*)executionEngine, allocator, meth);
+    mvm::MvmModule::addToVM(vm, &GFI, (JIT*)executionEngine, allocator, meth);
   }
     // Now that it's compiled, we don't need the IR anymore
   func->deleteBody();

Modified: vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll?rev=137024&r1=137023&r2=137024&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll (original)
+++ vmkit/trunk/lib/J3/LLVMRuntime/runtime-default.ll Sat Aug  6 13:25:44 2011
@@ -55,10 +55,8 @@
 %JavaField = type { i8*, i16, %UTF8*, %UTF8*, %Attribut*, i16, %JavaClass*, i32,
                     i16 }
 
-%CodeLineInfo = type { i8*, %JavaMethod*, %CodeLineInfo* }
-
 %JavaMethod = type { i8*, i16, %Attribut*, i16, %JavaClass*,
-                     %UTF8*, %UTF8*, i8, i8*, %CodeLineInfo*, i16, i32 }
+                     %UTF8*, %UTF8*, i8, i8*, i32 }
 
 %JavaClassPrimitive = type { %JavaCommonClass, i32 }
 %JavaClassArray = type { %JavaCommonClass, %JavaCommonClass* }
@@ -93,7 +91,6 @@
                            %Attribut,
                            %JavaThread,
                            %MutatorThread,
-                           %CodeLineInfo,
                            %J3DenseMap);
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

Modified: vmkit/trunk/lib/J3/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaClass.cpp?rev=137024&r1=137023&r2=137024&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaClass.cpp Sat Aug  6 13:25:44 2011
@@ -634,7 +634,6 @@
   access = A;
   canBeInlined = false;
   offset = 0;
-  frames = NULL;
 }
 
 void JavaField::initialise(Class* cl, const UTF8* N, const UTF8* T, uint16 A) {

Modified: vmkit/trunk/lib/J3/VMCore/JavaClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaClass.h?rev=137024&r1=137023&r2=137024&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaClass.h Sat Aug  6 13:25:44 2011
@@ -888,16 +888,6 @@
   ///
   void* code;
  
-  /// frames - Frames for this method.
-  /// TODO: Deprecate?
-  ///
-  mvm::Frames* frames;
-
-  /// codeInfoLength - Number of entries in the codeInfo field.
-  /// TODO: Deprecate.
-  ///
-  uint16 codeInfoLength;
-
   /// offset - The index of the method in the virtual table.
   ///
   uint32 offset;