harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r520260 - /harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escanalyzer.cpp
Date Tue, 20 Mar 2007 03:51:52 GMT
Author: varlax
Date: Mon Mar 19 20:51:51 2007
New Revision: 520260

URL: http://svn.apache.org/viewvc?view=rev&rev=520260
Log:
Assertion fixed after HARMONY-2874

Modified:
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escanalyzer.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escanalyzer.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escanalyzer.cpp?view=diff&rev=520260&r1=520259&r2=520260
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escanalyzer.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escanalyzer.cpp Mon Mar 19 20:51:51
2007
@@ -5763,12 +5763,12 @@
                 if ( (check_loc && (getEscState(scnode)==NO_ESCAPE)) ||
                     (!check_loc && (getEscState(scnode)!=NO_ESCAPE)) ) {
                     storeId = true;
-                    } else {
-                        if (_scinfo) {
-                            os_sc << "----scalar no opt:     check_loc " << check_loc

-                                << "  state " << getEscState(scnode) <<
std::endl;
-                        }
+                } else {
+                    if (_scinfo) {
+                        os_sc << "----scalar no opt:     check_loc " << check_loc

+                            << "  state " << getEscState(scnode) << std::endl;
                     }
+                }
             } else {
                 if (_scinfo) {
                     os_sc << "----scalar no opt: LOBJ  final fields " << ob_fin_fld_count

@@ -5791,7 +5791,7 @@
                     os_sc << "************* " << ((Opnd*)scnode->refObj)->getType()->getName()

                         << std::endl;
                 }
-                assert(vnode==0);
+                assert(vnode!=NULL);
                 CnGNode* lobj = getLObj(vnode);  // scalarizable load object
                 if (lobj != NULL) {
                     if (_scinfo) {



Mime
View raw message