Merge branch 'master' of https://github.com/chapel-lang/chapel into l…

…ocalize-default-hash

compiler/main/version.cpp

@@ -35,7 +35,7 @@ void
 get_version(char *v) {
   v += sprintf(v, "%d.%s.%s", MAJOR_VERSION, MINOR_VERSION, UPDATE_VERSION);
   if (strcmp(BUILD_VERSION, "0") != 0 || developer)
-    sprintf(v, " pre-release (%s)", BUILD_VERSION);
+    sprintf(v, ".%s", BUILD_VERSION);   // post-release
 }
 
 void

doc/rst/conf.py

@@ -61,12 +61,12 @@
 # 'version' adds a redundant version number onto the top of the sidebar
 # automatically (rtd-theme). We also don't use |version| anywhere in rst
 
-chplversion = '1.17 pre-release'    # TODO -- parse from `chpl --version`
+chplversion = '1.17'                # post-release
 shortversion = chplversion.replace('-', '&#8209') # prevent line-break at hyphen
 html_context = {"chplversion":chplversion}
 
 # The full version, including alpha/beta/rc tags.
-release = '1.17.0 pre-release'
+release = '1.17.0'                  # post-release
 
 # General information about the project.
 project = u'Chapel Documentation'

doc/rst/usingchapel/QUICKSTART.rst

@@ -16,7 +16,7 @@ enable more features, such as distributed memory execution.
 0) See :ref:`prereqs.rst <readme-prereqs>` for more information about system
    tools and packages you may need to have installed to build and run Chapel.
 
-1) If you don't already have Chapel 1.16, see
+1) If you don't already have Chapel 1.17, see
    https://chapel-lang.org/download.html .
 
 2) If you are using a source release, build Chapel in a *quickstart*
@@ -28,14 +28,14 @@ enable more features, such as distributed memory execution.
 
       .. code-block:: bash
 
-         tar xzf chapel-1.16.0.tar.gz
+         tar xzf chapel-1.17.0.tar.gz
 
    b. Make sure that your shell is in the directory containing
       QUICKSTART.rst, for example:
 
       .. code-block:: bash
 
-         cd chapel-1.16.0
+         cd chapel-1.17.0
 
    c. Set up your environment for Chapel's Quickstart mode.
       If you are using a shell other than bash,

doc/rst/usingchapel/chplenv.rst

@@ -33,7 +33,7 @@ CHPL_HOME
 
     .. code-block:: sh
 
-        export CHPL_HOME=~/chapel-1.16.0
+        export CHPL_HOME=~/chapel-1.17.0
 
    .. note::
      This, and all other examples in the Chapel documentation, assumes you're

doc/util/versionButton.php

@@ -84,7 +84,7 @@ function toggleDropDown() {
 
 // Note: assumes second element is most-recent release
 var chplVersions = [
-  "1.17 pre-release",
+  "1.17",   // post-release
   "1.16",
   "1.15",
   "1.14",
@@ -106,7 +106,7 @@ function dropSetup() {
   // Choose button color
   if (chplTitle.includes("pre-release")) {
     button.classList.add("preRelease");
-  } else if (chplTitle != chplVersions[1]) {
+  } else if (chplTitle != "1.17") {
     button.classList.add("oldVersion");
   } else {
     button.classList.add("currentVersion");

man/confchpl.rst

@@ -1,5 +1,5 @@
 
-:Version: 1.17.0 pre-release
+:Version: 1.17.0
 :Manual section: 1
 :Title: \\fBchpl\\fP
 :Subtitle: Compiler for the Chapel Programming Language

man/confchpldoc.rst

@@ -1,5 +1,5 @@
 
-:Version: 1.17.0 pre-release
+:Version: 1.17.0
 :Manual section: 1
 :Title: \\fBchpldoc\\fP
 :Subtitle: the Chapel Documentation Tool

test/compflags/bradc/printstuff/versionhelp.sh

@@ -5,4 +5,4 @@ compiler=$3
 echo -n `basename $compiler`
 cat $CWD/version.goodstart
 diff $CWD/../../../../compiler/main/BUILD_VERSION $CWD/zero.txt > /dev/null 2>&1 && echo "" || \
-    { echo -n " pre-release (" && cat $CWD/../../../../compiler/main/BUILD_VERSION | tr -d \"\\n && echo ")" ; }
+    { echo -n "." && cat $CWD/../../../../compiler/main/BUILD_VERSION | tr -d \" ; }    # post-release

test/multilocale/strings/assocOfString.chpl

@@ -0,0 +1,44 @@
+// This program sometimes fails on two or more locales, either getting
+// an out-of-bounds error or a segfault.  For a single locale, there
+// is no error.  If the strings are changed to integers, it doesn't
+// seem to get an error either, suggesting that something about using
+// strings across multiple locales may be the issue.  Running with a
+// smaller number of entries doesn't seem to solve the problem either
+// (I wondered for awhile whether the array resizing was causing
+// problems, but see failures with 3 entries where no resizing should
+// be done).
+//
+
+config const ENTRIES = 15,
+             debug = false;
+
+var keys: [0..#ENTRIES] string;
+for i in 0..#ENTRIES {
+  keys[i] = "%04i".format(i);
+  writeln(keys);
+}
+
+on Locales [numLocales-1] {
+  var D: domain(string);
+  var array: [D] uint(64);
+
+  if debug then
+    writeln("D is ", D.locale, ", array is ", array.locale);
+
+  for i in 0..#ENTRIES {
+    writeln("assign array [\"%s\"] = 12345".format(keys[i]));
+
+    array[keys[i]] = 12345;
+  }
+
+  if debug {
+    writeln(D);
+    for a in array do
+      writeln(a);
+    writeln(array);
+  }
+
+  for i in 0..#ENTRIES {
+    writeln("get array[\"%s\"]: %i".format(keys[i], array[keys[i]]));
+  }
+}

test/multilocale/strings/assocOfString.future

@@ -0,0 +1,11 @@
+associative-of-strings fails on non-zero locales
+
+This test gets either an OOB error or a segfault when running on 2+
+locales.  I believe that the issue relates to using string keys that
+are allocated on locale 0 and then used w.r.t. an associative array on
+locale 1.  Specifically, changing from string keys/values to integers
+makes the error go away, as does storing the `keys` array on the same
+locale as the associtaive domain, as does changing the intents on the
+default associative's dsiAccess() routines to 'const in'.  That said,
+I'm still not quite sure where the blame lies here.
+

test/multilocale/strings/assocOfString.good

@@ -0,0 +1,45 @@
+0000              
+0000 0001             
+0000 0001 0002            
+0000 0001 0002 0003           
+0000 0001 0002 0003 0004          
+0000 0001 0002 0003 0004 0005         
+0000 0001 0002 0003 0004 0005 0006        
+0000 0001 0002 0003 0004 0005 0006 0007       
+0000 0001 0002 0003 0004 0005 0006 0007 0008      
+0000 0001 0002 0003 0004 0005 0006 0007 0008 0009     
+0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 0010    
+0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 0010 0011   
+0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 0010 0011 0012  
+0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 0010 0011 0012 0013 
+0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 0010 0011 0012 0013 0014
+assign array ["0000"] = 12345
+assign array ["0001"] = 12345
+assign array ["0002"] = 12345
+assign array ["0003"] = 12345
+assign array ["0004"] = 12345
+assign array ["0005"] = 12345
+assign array ["0006"] = 12345
+assign array ["0007"] = 12345
+assign array ["0008"] = 12345
+assign array ["0009"] = 12345
+assign array ["0010"] = 12345
+assign array ["0011"] = 12345
+assign array ["0012"] = 12345
+assign array ["0013"] = 12345
+assign array ["0014"] = 12345
+get array["0000"]: 12345
+get array["0001"]: 12345
+get array["0002"]: 12345
+get array["0003"]: 12345
+get array["0004"]: 12345
+get array["0005"]: 12345
+get array["0006"]: 12345
+get array["0007"]: 12345
+get array["0008"]: 12345
+get array["0009"]: 12345
+get array["0010"]: 12345
+get array["0011"]: 12345
+get array["0012"]: 12345
+get array["0013"]: 12345
+get array["0014"]: 12345

test/multilocale/strings/assocOfString.numlocales

@@ -0,0 +1 @@
+2

test/multilocale/strings/assocOfString.skipif

@@ -0,0 +1 @@
+CHPL_COMM==none