From e15a6f99d4340f6ba4b8548277675706c3782beb Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Tue, 26 Nov 2019 08:12:51 -0700
Subject: [PATCH] cs: more consistent arity errors

Suppress the compiler's conversion of statically obvious arity errors
to an expression that reports a custom error with the an S-expression,
since that interferes with Rumble's normalization of error messages.
---
 pkgs/base/info.rkt              | 2 +-
 racket/src/cs/compile-file.ss   | 2 +-
 racket/src/cs/linklet.sls       | 3 ++-
 racket/src/racket/src/schvers.h | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/base/info.rkt b/pkgs/base/info.rkt
index c605b1522f..4fcd293bac 100644
--- a/pkgs/base/info.rkt
+++ b/pkgs/base/info.rkt
@@ -12,7 +12,7 @@
 
 (define collection 'multi)
 
-(define version "7.5.0.7")
+(define version "7.5.0.8")
 
 (define deps `("racket-lib"
                ["racket" #:version ,version]))
diff --git a/racket/src/cs/compile-file.ss b/racket/src/cs/compile-file.ss
index b405c30b64..0aee64e7ba 100644
--- a/racket/src/cs/compile-file.ss
+++ b/racket/src/cs/compile-file.ss
@@ -2,7 +2,7 @@
 ;; Check to make we're using a build of Chez Scheme
 ;; that has all the features we need.
 (define-values (need-maj need-min need-sub need-dev)
-  (values 9 5 3 4))
+  (values 9 5 3 5))
 
 (unless (guard (x [else #f]) (eval 'scheme-fork-version-number))
   (error 'compile-file
diff --git a/racket/src/cs/linklet.sls b/racket/src/cs/linklet.sls
index 0de00bef1c..01136b5b39 100644
--- a/racket/src/cs/linklet.sls
+++ b/racket/src/cs/linklet.sls
@@ -1187,4 +1187,5 @@
   (set-foreign-eval! eval/foreign)
 
   (enable-arithmetic-left-associative #t)
-  (expand-omit-library-invocations #t))
+  (expand-omit-library-invocations #t)
+  (enable-error-source-expression #f))
diff --git a/racket/src/racket/src/schvers.h b/racket/src/racket/src/schvers.h
index 24bd402ba2..bf27d19524 100644
--- a/racket/src/racket/src/schvers.h
+++ b/racket/src/racket/src/schvers.h
@@ -16,7 +16,7 @@
 #define MZSCHEME_VERSION_X 7
 #define MZSCHEME_VERSION_Y 5
 #define MZSCHEME_VERSION_Z 0
-#define MZSCHEME_VERSION_W 7
+#define MZSCHEME_VERSION_W 8
 
 /* A level of indirection makes `#` work as needed: */
 #define AS_a_STR_HELPER(x) #x