Fix building and testing with internal-dev flag

.circleci/config.yml

@@ -12,7 +12,7 @@ env: &env
       # ------------------------------------------------------------------------
       # GHC_OPTIONS: "-Werror"
       # For updating see: https://downloads.haskell.org/~ghcup/
-      GHCUP_VERSION: 0.1.20.0
+      GHCUP_VERSION: latest
       CABAL_REINIT_CONFIG: "y"
       LC_ALL: "C.UTF-8"
 
@@ -44,7 +44,7 @@ env: &env
       # ------------------------------------------------------------------------
       # Where to find the required tools
       # ------------------------------------------------------------------------
-      PATH: /sbin:/usr/sbin:/bin:/usr/bin
+      PATH: /sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
 
       # ------------------------------------------------------------------------
       # Location of packcheck.sh (the shell script invoked to perform CI tests ).
@@ -57,7 +57,7 @@ env: &env
       # If you have not committed packcheck.sh in your repo at PACKCHECK
       # then it is automatically pulled from this URL.
       PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
-      PACKCHECK_GITHUB_COMMIT: "dd6862df527f317fd4987afa523fba3f4fde7e19"
+      PACKCHECK_GITHUB_COMMIT: "157310b35907e93b9c5c69e6bdcad9ab6296260e"
 
 executors:
   amd64-executor:
@@ -91,11 +91,7 @@ preinstall: &preinstall
         apt-get install -y zlib1g-dev
 
         # For ghcup to install ghc
-        if test -n "$GHCUP_VERSION"
-        then
-          apt-get install -y gcc
-          apt-get install -y g++
-        fi
+        apt-get install -y build-essential
 
         # libgmp required by ghc for linking
         apt-get install -y libgmp-dev
@@ -146,24 +142,7 @@ save: &save
 #-----------------------------------------------------------------------------
 
 jobs:
-  cabal-ghc-8_6_5:
-      <<: *env
-      executor: amd64-executor
-      steps:
-        - checkout
-        - *restore
-        - *preinstall
-        - run:
-            environment:
-              GHCVER: "8.6.5"
-              CABALVER: "3.6.2.0"
-              CABAL_PROJECT: "cabal.project"
-              DISABLE_SDIST_BUILD: "yes"
-              CABAL_BUILD_OPTIONS: "--flag debug --flag -opt"
-            command: |
-              bash -c "$PACKCHECK cabal"
-        - *save
-  cabal-ghc-9_8_1-docspec:
+  cabal-ghc-9_14_1-docspec:
       <<: *env
       executor: amd64-executor
       steps:
@@ -172,8 +151,7 @@ jobs:
         - *preinstall
         - run:
             environment:
-              GHCVER: "9.8.1"
-              CABALVER: "3.10.1.0"
+              GHCVER: "9.14.1"
               CABAL_PROJECT: "cabal.project.doctest"
               DISABLE_SDIST_BUILD: "y"
               DISABLE_TEST: "y"
@@ -212,9 +190,7 @@ workflows:
   version: 2
   build:
     jobs:
-      #- cabal-ghc-8_6_5:
-      #    name: 8.6.5-debug-unoptimized
-      - cabal-ghc-9_8_1-docspec:
-          name: ghc-9.8.1-docspec
+      - cabal-ghc-9_14_1-docspec:
+          name: ghc-9.14.1-docspec
       - hlint-trailing-spaces:
           name: hlint and trailing spaces

.github/workflows/haskell.yml

@@ -192,13 +192,14 @@ jobs:
             subdir: core
             ignore_error: false
 
-          - name: debug-no-opt
+          # This includes the debug flag as well
+          - name: dev-no-opt
             runner: macos-latest
             command: cabal
             ghc_version: 9.14.1
             # WARNING! cannot use # comments inside pack_options.
             pack_options: >-
-              CABAL_PROJECT=cabal.project
+              CABAL_PROJECT=cabal.project.dev
               CABAL_BUILD_OPTIONS="--flag debug --flag -opt"
             ignore_error: false
 

.packcheck.ignore

@@ -31,6 +31,7 @@ cabal.project.markdown-doctest
 cabal.project.streamly
 cabal.project.Werror
 cabal.project.Werror-nocode
+cabal.project.dev
 core/
 examples/README.md
 flake.lock

benchmark/streamly-benchmarks.cabal

@@ -110,9 +110,6 @@ common compile-options
     -- if flag(use-streamly-core)
     --   cpp-options:    -DUSE_STREAMLY_CORE
 
-    if flag(dev)
-      cpp-options:    -DDEVBUILD
-
     if flag(include-strict-utf8)
       cpp-options:    -DINCLUDE_STRICT_UTF8
 
@@ -146,10 +143,6 @@ common compile-options
     if flag(has-llvm)
       ghc-options: -fllvm
 
-    if flag(dev)
-      ghc-options:    -Wmissed-specialisations
-                      -Wall-missed-specialisations
-
 common optimization-options
   if flag(opt)
     ghc-options: -O2
@@ -158,7 +151,7 @@ common optimization-options
                  -fmax-worker-args=16
 
     -- For this to be effective it must come after the -O2 option
-    if flag(dev) || flag(debug)
+    if flag(debug)
       ghc-options: -fno-ignore-asserts
 
     if flag(fusion-plugin) && !impl(ghcjs) && !impl(ghc < 8.6)
@@ -205,10 +198,6 @@ common bench-depends
     build-depends:
         template-haskell   >= 2.14 && < 2.25
       , inspection-testing >= 0.4  && < 0.7
-  -- Array uses a Storable constraint in dev build making several inspection
-  -- tests fail
-  if flag(dev) && flag(inspection)
-    build-depends: inspection-and-dev-flags-cannot-be-used-together
 
 -------------------------------------------------------------------------------
 -- Library
@@ -660,13 +649,6 @@ benchmark Unicode.Parser
   hs-source-dirs: Streamly/Benchmark/Unicode
   main-is: Parser.hs
 
-executable nano-bench
-  import: bench-options
-  hs-source-dirs: .
-  main-is: NanoBenchmarks.hs
-  if !flag(dev)
-    buildable: False
-
 benchmark Unicode.Stream
   import: bench-options
   type: exitcode-stdio-1.0

cabal.project.dev

@@ -0,0 +1,44 @@
+packages:   streamly.cabal
+          , core/streamly-core.cabal
+          , test/streamly-tests.cabal
+          , benchmark/streamly-benchmarks.cabal
+          , bench-test-lib/bench-test-lib.cabal
+
+-- For compiling standalone programs
+-- write-ghc-environment-files: always
+
+-- For debugging heap overflow
+-- jobs: 1
+
+package streamly-core
+  flags: +internal-dev
+  ghc-options:    -DDEVBUILD -DDEBUG
+                  -Wmissed-specialisations
+                  -Wall-missed-specialisations
+                  -fno-ignore-asserts
+
+package streamly
+  flags: +internal-dev
+  ghc-options:    -DDEVBUILD -DDEBUG
+                  -Wmissed-specialisations
+                  -Wall-missed-specialisations
+                  -fno-ignore-asserts
+
+package streamly-tests
+  flags: +dev
+  ghc-options:    -DDEVBUILD -DDEBUG
+                  -Wmissed-specialisations
+                  -Wall-missed-specialisations
+                  -fno-ignore-asserts
+
+package streamly-benchmarks
+  flags: +dev
+  ghc-options:    -DDEVBUILD -DDEBUG
+                  -Wmissed-specialisations
+                  -Wall-missed-specialisations
+                  -fno-ignore-asserts
+
+source-repository-package
+  type: git
+  location: https://github.com/composewell/fusion-plugin.git
+  tag: 15c0ad50a235a35e85d03cced9ad0f3938565e5a

core/src/Streamly/Internal/Data/Array.hs

@@ -403,11 +403,7 @@ streamTransform f arr =
 --
 -- /Pre-release/
 --
-unsafeCast, castUnsafe ::
-#ifdef DEVBUILD
-    Unbox b =>
-#endif
-    Array a -> Array b
+unsafeCast, castUnsafe :: Array a -> Array b
 unsafeCast (Array contents start end) =
     Array contents start end
 RENAME(castUnsafe,unsafeCast)