2005-12-21 Josh Stone <joshua.i.stone@intel.com>

        * translate.cxx (itervar::next): emit different code for pmaps

diff --git a/ChangeLog b/ChangeLog
index 8d3af735117410df0a8e59f88933bee6eec3545a..dafbf9f0ef932b22fae508ca0ccde5677c2496e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-21  Josh Stone  <joshua.i.stone@intel.com>
+
+       * translate.cxx (itervar::next): emit different code for pmaps
+
 2005-12-21  Frank Ch. Eigler  <fche@elastic.org>
 
        * loc2c.h: Add __attribute__ defeating code for g++ 3.3 compatibility.

diff --git a/translate.cxx b/translate.cxx
index 98c6813b3ab9aa2988ea0e864c9b813e37dcf8f1..bda28e8b2ed917e0d80af001855d961444ae26ea 100644 (file)
--- a/translate.cxx
+++ b/translate.cxx
@@ -721,7 +721,10 @@ public:
     if (mv.type() != referent_ty)
       throw semantic_error("inconsistent iterator type in itervar::next()");
 
-    return "_stp_map_iter (" + mv.qname() + ", " + qname() + ")";
+    if (mv.is_parallel())
+      return "_stp_map_iter (" + mv.fetch_existing_aggregate() + ", " + qname() + ")";
+    else
+      return "_stp_map_iter (" + mv.qname() + ", " + qname() + ")";
   }
 
   string qname () const