commit fc83a2f8fb610e56805fd8846bf1eac508a07fcf
author Nicolas Geoffray <nicolas.geoffray@lip6.fr> Tue Dec 02 23:32:25 2008 +0000
committer Nicolas Geoffray <nicolas.geoffray@lip6.fr> Tue Dec 02 23:32:25 2008 +0000
tree 3f70c3feae1d0ce18a3cbc3d05df0201f3a4f961
parent c47adf3d2befb15eba47202ff8515faf91addd58

 Remove the loaded value if it is not needed, in GetStaticInstance.

llvm-svn: 60445

vmkit/lib/JnJVM/VMCore/LowerConstantCalls.cpp

diff --git a/vmkit/lib/JnJVM/VMCore/LowerConstantCalls.cpp b/vmkit/lib/JnJVM/VMCore/LowerConstantCalls.cpp
index d18819f..939bc20 100644
--- a/vmkit/lib/JnJVM/VMCore/LowerConstantCalls.cpp
+++ b/vmkit/lib/JnJVM/VMCore/LowerConstantCalls.cpp
@@ -347,10 +347,14 @@
           
           ConstantInt* C = (ConstantInt*)CE->getOperand(0);
           Class* cl = (Class*)C->getZExtValue();
-
+          
+          Instruction* R = dyn_cast<Instruction>(Call.getArgument(0));
           Value* Replace = module->getStaticInstance(cl, CI);
           CI->replaceAllUsesWith(Replace);
           CI->eraseFromParent();
+          
+          if (R && !R->getNumUses()) R->eraseFromParent();
+         
 
 #elif defined(ISOLATE)
           Value* TCM = getTCM(module, Call.getArgument(0), CI);