[Open64-devel] r3941 - in trunk/osprey: be/lno common/com ipa/main/analyze

[<sv...@op...>]

Author: dcoakley
Date: 2012-06-16 18:40:55 -0400 (Sat, 16 Jun 2012)
New Revision: 3941

Modified:
   trunk/osprey/be/lno/lego.cxx
   trunk/osprey/common/com/wn_tree_util.h
   trunk/osprey/ipa/main/analyze/ipa_nystrom_alias_analyzer.cxx
Log:
Fix compilation errors reported by gcc 4.7 on Fedora 17.

In the template function Unwind (wn_tree_util.h), qualify Set_wn member
function calls with "this->".

In Delete_All_Distr_Pragmas (lego.cxx), use a different name for the
inner loop index.

In ipa_nystrom_alias_analyzer.cxx, include <unistd.h> to get the prototype
for sbrk().

Approved by: Jian-Xin Lai


Modified: trunk/osprey/be/lno/lego.cxx
===================================================================
--- trunk/osprey/be/lno/lego.cxx	2012-06-11 20:31:37 UTC (rev 3940)
+++ trunk/osprey/be/lno/lego.cxx	2012-06-16 22:40:55 UTC (rev 3941)
@@ -390,13 +390,13 @@
 static void Delete_All_Distr_Pragmas () {
   for (INT i=0; i<da_stack->Elements(); i++) {
     DISTR_INFO* dinfo = da_stack->Bottom_nth(i);
-    INT i;
-    for (i=0; i<dinfo->Num_Dact(); i++) {
-      DISTR_ARRAY* dact = dinfo->Get_Dact(i);
+    INT j;
+    for (j=0; j<dinfo->Num_Dact(); j++) {
+      DISTR_ARRAY* dact = dinfo->Get_Dact(j);
       Delete_Distr_Pragmas (dact);
     }
-    for (i=0; i<dinfo->Num_Gen_Redistr(); i++) {
-      DISTR_ARRAY* dact = dinfo->Get_Gen_Redistr(i);
+    for (j=0; j<dinfo->Num_Gen_Redistr(); j++) {
+      DISTR_ARRAY* dact = dinfo->Get_Gen_Redistr(j);
       Delete_Distr_Pragmas (dact);
     }
   }

Modified: trunk/osprey/common/com/wn_tree_util.h
===================================================================
--- trunk/osprey/common/com/wn_tree_util.h	2012-06-11 20:31:37 UTC (rev 3940)
+++ trunk/osprey/common/com/wn_tree_util.h	2012-06-16 22:40:55 UTC (rev 3941)
@@ -455,7 +455,7 @@
     
     if (WN_operator(parent_wn) == OPR_BLOCK) {
       if (WN_next(wn)) {
-        Set_wn(WN_next(wn));
+        this->Set_wn(WN_next(wn));
         done = TRUE;
       }
       else // all stmts in a block processed ==> go back up
@@ -464,7 +464,7 @@
     else { // parent is NON_BLOCK ie increment kid_count to get next sibling
       INT indx = this->Get_kid_index();
       if ((0 <= indx) && (indx < WN_kid_count(parent_wn) - 1)) {
-        Set_wn(WN_kid(parent_wn,this->Inc_kid_index()));
+        this->Set_wn(WN_kid(parent_wn,this->Inc_kid_index()));
         done = TRUE;
       }
       else {

Modified: trunk/osprey/ipa/main/analyze/ipa_nystrom_alias_analyzer.cxx
===================================================================
--- trunk/osprey/ipa/main/analyze/ipa_nystrom_alias_analyzer.cxx	2012-06-11 20:31:37 UTC (rev 3940)
+++ trunk/osprey/ipa/main/analyze/ipa_nystrom_alias_analyzer.cxx	2012-06-16 22:40:55 UTC (rev 3941)
@@ -17,6 +17,7 @@
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  MA  02110-1301, USA.
 */
+#include <unistd.h>
 #include <elf.h>
 #include <stack>