You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by mf...@apache.org on 2008/01/19 14:38:06 UTC
svn commit: r613390 -
/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/osr.cpp
Author: mfursov
Date: Sat Jan 19 05:38:06 2008
New Revision: 613390
URL: http://svn.apache.org/viewvc?rev=613390&view=rev
Log:
Fix for HARMONY-5270 [drlvm][jit][opt] Eclipse can't be started of OSR optimization is ON
Modified:
harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/osr.cpp
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/osr.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/osr.cpp?rev=613390&r1=613389&r2=613390&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/osr.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/osr.cpp Sat Jan 19 05:38:06 2008
@@ -580,7 +580,6 @@
SsaOpnd* OSR::apply(Type* type, Opcode opcode, Operation op,
SsaOpnd* opnd1, SsaOpnd* opnd2){
- findLeadingOpnd(opnd2->getInst(), opnd2);
SsaOpnd* opnd2Leader = getLeadingOperand(opnd2);
if (opnd2Leader!= 0) {
opnd2 = opnd2Leader;
@@ -627,8 +626,14 @@
}
return result;
}
+Inst* OSR::findInsertionPlace(SsaOpnd* opnd1, SsaOpnd* opnd2){
+
+ findLeadingOpnd(opnd2->getInst(), opnd2);
+ SsaOpnd* opnd2Leader = getLeadingOperand(opnd2);
+ if (opnd2Leader!= 0) {
+ opnd2 = opnd2Leader;
+ }
-Inst* OSR::findInsertionPlace(SsaOpnd* opnd2, SsaOpnd* opnd1){
Inst* opnd1inst = opnd1->getInst();
Inst* opnd2inst = opnd2->getInst();
Node* block1 = opnd1inst->getNode();