harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r680674 - in /harmony/enhanced/drlvm/trunk/vm/jitrino/src: codegenerator/ia32/Ia32RegAllocCheck.cpp main/PMF.cpp optimizer/abcd/abcdsolver.cpp optimizer/lazyexceptionopt.cpp
Date Tue, 29 Jul 2008 11:25:50 GMT
Author: hindessm
Date: Tue Jul 29 04:25:49 2008
New Revision: 680674

URL: http://svn.apache.org/viewvc?rev=680674&view=rev
Log:
Fix ambiguous else clauses that were causing g++ 4.3 compiler warnings
which were treated as errors in the drlvm build.

Modified:
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAllocCheck.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMF.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/abcdsolver.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/lazyexceptionopt.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAllocCheck.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAllocCheck.cpp?rev=680674&r1=680673&r2=680674&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAllocCheck.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAllocCheck.cpp Tue
Jul 29 04:25:49 2008
@@ -200,7 +200,7 @@
                 //  conditional definitions are ignored
                 if ((props & Inst::Properties_Conditional) == 0)
                 {
-                    if (regdefs[ridx] != regnxts[ridx])
+                    if (regdefs[ridx] != regnxts[ridx]) {
                         if (regnxts[ridx] != 0)
                         {
                             error() << "  " << *inst << " " << regName((int)ridx)

@@ -211,7 +211,7 @@
                         {
                             //  dead def
                         }
-
+                    }
                     regnxts[ridx] = 0;  // this register can used in the instruction
                 }
             }

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMF.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMF.cpp?rev=680674&r1=680673&r2=680674&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMF.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMF.cpp Tue Jul 29 04:25:49 2008
@@ -622,11 +622,12 @@
         for (size_t idx = 0, n = streams.size(); idx != n; ++idx)
         {
             const LogTemplate& lt = streams.logtemplate(idx);
-            if ((lt.pathp == 0 || lt.pathp->empty()) && lt.sid == sid)
+            if ((lt.pathp == 0 || lt.pathp->empty()) && lt.sid == sid) {
                 if (lt.filtername == pipe)
                     return streams.logstream(idx);
                 else if (lt.filtername.empty())
                     lsp = &streams.logstream(idx);
+            }
         }
         if (lsp != 0)
             return *lsp;
@@ -653,11 +654,12 @@
         for (size_t idx = 0, n = streams.size(); idx != n; ++idx)
         {
             const LogTemplate& lt = streams.logtemplate(idx);
-            if ((lt.pathp == 0 || lt.pathp->empty()) && lt.streamname == streamname)
+            if ((lt.pathp == 0 || lt.pathp->empty()) && lt.streamname == streamname)
{
                 if (lt.filtername == pipe)
                     return streams.logstream(idx);
                 else if (lt.filtername.empty())
                     lsp = &streams.logstream(idx);
+            }
         }
         if (lsp != 0)
             return *lsp;
@@ -2004,7 +2006,7 @@
                 cmdp->fatal("Invalid path item selection");
         }
 
-        if (goon)
+        if (goon) {
             if (child.aliasp != 0)
                 walk(pipeline, child.aliasp, fqname);
             else
@@ -2018,6 +2020,7 @@
                 *step.fqname = fqname;
                 pipeline.steps->push_back(step);
             }
+        }
 
         fqname.pop_back();
     }

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/abcdsolver.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/abcdsolver.cpp?rev=680674&r1=680673&r2=680674&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/abcdsolver.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/abcdsolver.cpp Tue Jul 29 04:25:49
2008
@@ -370,11 +370,12 @@
                     Log::out() << ::std::endl;
                 }
                 AbcdReasons *ignore;
-                if (!thePass->isMarkedToEliminate(theInst, ignore))
+                if (!thePass->isMarkedToEliminate(theInst, ignore)) {
                     if (why)
                         thePass->markCheckToEliminateAndWhy(theInst, why);
                     else
                         thePass->markCheckToEliminate(theInst);
+                }
             } else {
                 if (Log::isEnabled()) {
                     Log::out() << "!!! We can eliminate UB check of ";
@@ -386,11 +387,12 @@
                     Log::out() << ::std::endl;
                 }
                 AbcdReasons *ignore;
-                if (!thePass->isMarkedToEliminateUB(theInst, ignore))
+                if (!thePass->isMarkedToEliminateUB(theInst, ignore)) {
                     if (why)
                         thePass->markCheckToEliminateUBAndWhy(theInst, why);
                     else 
                         thePass->markCheckToEliminateUB(theInst);
+                }
             }
         } else {
             if (successLB) {
@@ -404,11 +406,12 @@
                     Log::out() << ::std::endl;
                 }
                 AbcdReasons *ignore;
-                if (!thePass->isMarkedToEliminateLB(theInst, ignore))
+                if (!thePass->isMarkedToEliminateLB(theInst, ignore)) {
                     if (why)
                         thePass->markCheckToEliminateLBAndWhy(theInst, why);
                     else
                         thePass->markCheckToEliminateLB(theInst);
+                }
             }
         }
         if (!(successLB && successUB)) {

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/lazyexceptionopt.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/lazyexceptionopt.cpp?rev=680674&r1=680673&r2=680674&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/lazyexceptionopt.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/lazyexceptionopt.cpp Tue Jul 29
04:25:49 2008
@@ -142,7 +142,7 @@
         }
     }
     if (md.getSideEffect() == MSE_Unknown) {
-        if (m_sideEff == MSE_Unknown)
+        if (m_sideEff == MSE_Unknown) {
             if (isExceptionInit && isArgCheckNull) {
 #ifdef _DEBUG
                 if (Log::isEnabled()) {
@@ -153,6 +153,7 @@
                 m_sideEff = MSE_True_Null_Param;
             } else
                 m_sideEff = MSE_False;
+        }
         md.setSideEffect(m_sideEff);
     } 
 



Mime
View raw message