[vmkit-commits] [vmkit] r96339 - in /vmkit/trunk: include/mvm/VirtualMachine.h lib/J3/VMCore/JavaInitialise.cpp lib/J3/VMCore/Jnjvm.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Feb 16 02:29:27 2010
New Revision: 96339

URL: http://llvm.org/viewvc/llvm-project?rev=96339&view=rev
Log:
Destroy the scanner, if there is any.


Modified:
    vmkit/trunk/include/mvm/VirtualMachine.h
    vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp
    vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp

Modified: vmkit/trunk/include/mvm/VirtualMachine.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/VirtualMachine.h?rev=96339&r1=96338&r2=96339&view=diff

==============================================================================
--- vmkit/trunk/include/mvm/VirtualMachine.h (original)
+++ vmkit/trunk/include/mvm/VirtualMachine.h Tue Feb 16 02:29:27 2010
@@ -260,7 +260,9 @@
 
   virtual void tracer();
 
-  virtual ~VirtualMachine() {}
+  virtual ~VirtualMachine() {
+    if (scanner) delete scanner;
+  }
 
   /// runApplication - Run an application. The application name is in
   /// the arguments, hence it is the virtual machine's job to parse them.

Modified: vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp?rev=96339&r1=96338&r2=96339&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaInitialise.cpp Tue Feb 16 02:29:27 2010
@@ -50,7 +50,6 @@
 mvm::VirtualMachine* mvm::VirtualMachine::createJVM(JnjvmClassLoader* C) {
   mvm::BumpPtrAllocator* A = new mvm::BumpPtrAllocator();
   Jnjvm* vm = new(*A, "VM") Jnjvm(*A, (JnjvmBootstrapLoader*)C);
-  vm->scanner = C->getCompiler()->createStackScanner();
   return vm;
 }
 

Modified: vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp?rev=96339&r1=96338&r2=96339&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp Tue Feb 16 02:29:27 2010
@@ -1361,6 +1361,7 @@
   IsolateLock.unlock();
 #endif
 
+  scanner = loader->getCompiler()->createStackScanner();
 }
 
 Jnjvm::~Jnjvm() {