harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r546195 - /harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.cpp
Date Mon, 11 Jun 2007 16:52:08 GMT
Author: varlax
Date: Mon Jun 11 09:52:07 2007
New Revision: 546195

URL: http://svn.apache.org/viewvc?view=rev&rev=546195
Log:
Fix up spoiled commit [545753] HARMONY-3797

Modified:
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.cpp?view=diff&rev=546195&r1=546194&r2=546195
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.cpp Mon Jun
11 09:52:07 2007
@@ -1521,23 +1521,23 @@
 }
 
 void JavaLabelPrepass::dup_x1() {
-    StateInfo::SlotInfo& opnd1 = popType();
-    StateInfo::SlotInfo& opnd2 = popType();
+    StateInfo::SlotInfo opnd1 = popType();
+    StateInfo::SlotInfo opnd2 = popType();
     pushType(opnd1);
     pushType(opnd2);
     pushType(opnd1);
 }
 
 void JavaLabelPrepass::dup_x2() {
-    StateInfo::SlotInfo& opnd1 = popType();
-    StateInfo::SlotInfo& opnd2 = popType();
+    StateInfo::SlotInfo opnd1 = popType();
+    StateInfo::SlotInfo opnd2 = popType();
     if (isCategory2(opnd2)) {
         pushType(opnd1);
         pushType(opnd2);
         pushType(opnd1);
         return;
     }
-    StateInfo::SlotInfo& opnd3 = popType();
+    StateInfo::SlotInfo opnd3 = popType();
     pushType(opnd1);
     pushType(opnd3);
     pushType(opnd2);
@@ -1545,13 +1545,13 @@
 }
 
 void JavaLabelPrepass::dup2() {
-    StateInfo::SlotInfo& opnd1 = popType();
+    StateInfo::SlotInfo opnd1 = popType();
     if (isCategory2(opnd1)) {
         pushType(opnd1);
         pushType(opnd1);
         return;
     }
-    StateInfo::SlotInfo& opnd2 = popType();
+    StateInfo::SlotInfo opnd2 = popType();
     pushType(opnd2);
     pushType(opnd1);
     pushType(opnd2);
@@ -1559,8 +1559,8 @@
 }
 
 void JavaLabelPrepass::dup2_x1() {
-    StateInfo::SlotInfo& opnd1 = popType();
-    StateInfo::SlotInfo& opnd2 = popType();
+    StateInfo::SlotInfo opnd1 = popType();
+    StateInfo::SlotInfo opnd2 = popType();
     if (isCategory2(opnd1)) {
         // opnd1 is a category 2 instruction
         pushType(opnd1);
@@ -1568,7 +1568,7 @@
         pushType(opnd1);
     } else {
         // opnd1 is a category 1 instruction
-        StateInfo::SlotInfo& opnd3 = popType();
+        StateInfo::SlotInfo opnd3 = popType();
         pushType(opnd2);
         pushType(opnd1);
         pushType(opnd3);
@@ -1579,8 +1579,8 @@
 
 
 void JavaLabelPrepass::dup2_x2() {
-    StateInfo::SlotInfo& opnd1 = popType();
-    StateInfo::SlotInfo& opnd2 = popType();
+    StateInfo::SlotInfo opnd1 = popType();
+    StateInfo::SlotInfo opnd2 = popType();
     if (isCategory2(opnd1)) {
         // opnd1 is category 2
         if (isCategory2(opnd2)) {
@@ -1589,7 +1589,7 @@
             pushType(opnd1);
         } else {
             // opnd2 is category 1
-            StateInfo::SlotInfo& opnd3 = popType();
+            StateInfo::SlotInfo opnd3 = popType();
             assert(isCategory2(opnd3) == false);
             pushType(opnd1);
             pushType(opnd3);
@@ -1599,7 +1599,7 @@
     } else {
         assert(isCategory2(opnd2) == false);
         // both opnd1 & opnd2 are category 1
-        StateInfo::SlotInfo& opnd3 = popType();
+        StateInfo::SlotInfo opnd3 = popType();
         if (isCategory2(opnd3)) {
             pushType(opnd2);
             pushType(opnd1);
@@ -1608,7 +1608,7 @@
             pushType(opnd1);
         } else {
             // opnd1, opnd2, opnd3 all are category 1
-            StateInfo::SlotInfo& opnd4 = popType();
+            StateInfo::SlotInfo opnd4 = popType();
             assert(isCategory2(opnd4) == false);
             pushType(opnd2);
             pushType(opnd1);
@@ -1621,8 +1621,8 @@
 }
 
 void JavaLabelPrepass::swap() {
-    StateInfo::SlotInfo& opnd1 = popType();
-    StateInfo::SlotInfo& opnd2 = popType();
+    StateInfo::SlotInfo opnd1 = popType();
+    StateInfo::SlotInfo opnd2 = popType();
     pushType(opnd1);
     pushType(opnd2);
 }
@@ -1895,10 +1895,8 @@
         if (vars) {
             if(Log::isEnabled()) {
                 Log::out() << "addVarIncarnations to SlotVar:" << ::std::endl;
-                Log::out() << "   vars: ";
-                vars->print(Log::out());
-                Log::out() << "in_vars: ";
-                in_vars->print(Log::out());
+                Log::out() << "   vars:\t";vars->print(Log::out());Log::out() <<
::std::endl;
+                Log::out() << "in_vars:\t";in_vars->print(Log::out());Log::out()
<< ::std::endl;
             }
             if (vars->addVarIncarnations(in_vars, memManager, offset)) {
                 prepass.getVisited()->setBit(offset,false);
@@ -1907,8 +1905,7 @@
                  vars->mergeVarIncarnations(&typeManager);
             }
             if(Log::isEnabled()) {
-                Log::out() << "result_vars: ";
-                vars->print(Log::out());
+                Log::out() << "result_vars:\t";vars->print(Log::out());Log::out()
<< ::std::endl;
             }
         }
     } else {



Mime
View raw message