You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by va...@apache.org on 2006/12/06 15:30:49 UTC
svn commit: r483092 -
/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp
Author: varlax
Date: Wed Dec 6 06:30:48 2006
New Revision: 483092
URL: http://svn.apache.org/viewvc?view=rev&rev=483092
Log:
Applied HARMONY-2485 [drlvm][jit][opt] NPE on EM64T with OPT.
Tested on SUSE9@em64t.
Modified:
harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp?view=diff&rev=483092&r1=483091&r2=483092
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp Wed Dec 6 06:30:48 2006
@@ -1500,9 +1500,8 @@
return irManager.newImmOpnd(dstType, Opnd::RuntimeInfo::Kind_VTableConstantAddr, base);
#else
Opnd * acc = irManager.newOpnd(dstType);
- copyOpnd(acc, irManager.newImmOpnd(dstType,(POINTER_SIZE_INT)compilationInterface.getVTableBase()));
-
- return simpleOp_I8(Mnemonic_ADD, dstType, acc, irManager.newImmOpnd(dstType, Opnd::RuntimeInfo::Kind_VTableConstantAddr, base));
+ copyOpnd(acc, irManager.newImmOpnd(dstType, Opnd::RuntimeInfo::Kind_VTableConstantAddr, base));
+ return acc;
#endif
}