Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Glasgow Haskell Compiler
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Shayne Fletcher
Glasgow Haskell Compiler
Commits
5a1ce45d
Commit
5a1ce45d
authored
Feb 14, 2020
by
Joshua Price
Committed by
Marge Bot
Feb 18, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix unboxed tuple size limit (#17837)
parent
40d917fb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
55 additions
and
3 deletions
+55
-3
compiler/GHC/Rename/Env.hs
compiler/GHC/Rename/Env.hs
+8
-3
testsuite/tests/rename/should_compile/T17837.hs
testsuite/tests/rename/should_compile/T17837.hs
+46
-0
testsuite/tests/rename/should_compile/all.T
testsuite/tests/rename/should_compile/all.T
+1
-0
No files found.
compiler/GHC/Rename/Env.hs
View file @
5a1ce45d
...
...
@@ -65,7 +65,7 @@ import DataCon
import
TyCon
import
ErrUtils
(
MsgDoc
)
import
PrelNames
(
rOOT_MAIN
)
import
BasicTypes
(
pprWarningTxtForMsg
,
TopLevelFlag
(
..
))
import
BasicTypes
(
pprWarningTxtForMsg
,
TopLevelFlag
(
..
)
,
TupleSort
(
..
)
)
import
SrcLoc
import
Outputable
import
UniqSet
(
uniqSetAny
)
...
...
@@ -298,8 +298,13 @@ lookupExactOcc_either name
ATyCon
tc
->
Just
tc
AConLike
(
RealDataCon
dc
)
->
Just
(
dataConTyCon
dc
)
_
->
Nothing
,
isTupleTyCon
tycon
=
do
{
checkTupSize
(
tyConArity
tycon
)
,
Just
tupleSort
<-
tyConTuple_maybe
tycon
=
do
{
let
tupArity
=
case
tupleSort
of
-- Unboxed tuples have twice as many arguments because of the
-- 'RuntimeRep's (#17837)
UnboxedTuple
->
tyConArity
tycon
`
div
`
2
_
->
tyConArity
tycon
;
checkTupSize
tupArity
;
return
(
Right
name
)
}
|
isExternalName
name
...
...
testsuite/tests/rename/should_compile/T17837.hs
0 → 100644
View file @
5a1ce45d
{-# LANGUAGE UnboxedTuples #-}
module
T17837
where
type
UTup62
=
(
#
,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
#
)
makeUTup62
::
t00
->
t01
->
t02
->
t03
->
t04
->
t05
->
t06
->
t07
->
t08
->
t09
->
t10
->
t11
->
t12
->
t13
->
t14
->
t15
->
t16
->
t17
->
t18
->
t19
->
t20
->
t21
->
t22
->
t23
->
t24
->
t25
->
t26
->
t27
->
t28
->
t29
->
t30
->
t31
->
t32
->
t33
->
t34
->
t35
->
t36
->
t37
->
t38
->
t39
->
t40
->
t41
->
t42
->
t43
->
t44
->
t45
->
t46
->
t47
->
t48
->
t49
->
t50
->
t51
->
t52
->
t53
->
t54
->
t55
->
t56
->
t57
->
t58
->
t59
->
t60
->
t61
->
(
#
t00
,
t01
,
t02
,
t03
,
t04
,
t05
,
t06
,
t07
,
t08
,
t09
,
t10
,
t11
,
t12
,
t13
,
t14
,
t15
,
t16
,
t17
,
t18
,
t19
,
t20
,
t21
,
t22
,
t23
,
t24
,
t25
,
t26
,
t27
,
t28
,
t29
,
t30
,
t31
,
t32
,
t33
,
t34
,
t35
,
t36
,
t37
,
t38
,
t39
,
t40
,
t41
,
t42
,
t43
,
t44
,
t45
,
t46
,
t47
,
t48
,
t49
,
t50
,
t51
,
t52
,
t53
,
t54
,
t55
,
t56
,
t57
,
t58
,
t59
,
t60
,
t61
#
)
makeUTup62
x00
x01
x02
x03
x04
x05
x06
x07
x08
x09
x10
x11
x12
x13
x14
x15
x16
x17
x18
x19
x20
x21
x22
x23
x24
x25
x26
x27
x28
x29
x30
x31
x32
x33
x34
x35
x36
x37
x38
x39
x40
x41
x42
x43
x44
x45
x46
x47
x48
x49
x50
x51
x52
x53
x54
x55
x56
x57
x58
x59
x60
x61
=
(
#
x00
,
x01
,
x02
,
x03
,
x04
,
x05
,
x06
,
x07
,
x08
,
x09
,
x10
,
x11
,
x12
,
x13
,
x14
,
x15
,
x16
,
x17
,
x18
,
x19
,
x20
,
x21
,
x22
,
x23
,
x24
,
x25
,
x26
,
x27
,
x28
,
x29
,
x30
,
x31
,
x32
,
x33
,
x34
,
x35
,
x36
,
x37
,
x38
,
x39
,
x40
,
x41
,
x42
,
x43
,
x44
,
x45
,
x46
,
x47
,
x48
,
x49
,
x50
,
x51
,
x52
,
x53
,
x54
,
x55
,
x56
,
x57
,
x58
,
x59
,
x60
,
x61
#
)
uTup62id
::
(
#
t00
,
t01
,
t02
,
t03
,
t04
,
t05
,
t06
,
t07
,
t08
,
t09
,
t10
,
t11
,
t12
,
t13
,
t14
,
t15
,
t16
,
t17
,
t18
,
t19
,
t20
,
t21
,
t22
,
t23
,
t24
,
t25
,
t26
,
t27
,
t28
,
t29
,
t30
,
t31
,
t32
,
t33
,
t34
,
t35
,
t36
,
t37
,
t38
,
t39
,
t40
,
t41
,
t42
,
t43
,
t44
,
t45
,
t46
,
t47
,
t48
,
t49
,
t50
,
t51
,
t52
,
t53
,
t54
,
t55
,
t56
,
t57
,
t58
,
t59
,
t60
,
t61
#
)
->
(
#
t00
,
t01
,
t02
,
t03
,
t04
,
t05
,
t06
,
t07
,
t08
,
t09
,
t10
,
t11
,
t12
,
t13
,
t14
,
t15
,
t16
,
t17
,
t18
,
t19
,
t20
,
t21
,
t22
,
t23
,
t24
,
t25
,
t26
,
t27
,
t28
,
t29
,
t30
,
t31
,
t32
,
t33
,
t34
,
t35
,
t36
,
t37
,
t38
,
t39
,
t40
,
t41
,
t42
,
t43
,
t44
,
t45
,
t46
,
t47
,
t48
,
t49
,
t50
,
t51
,
t52
,
t53
,
t54
,
t55
,
t56
,
t57
,
t58
,
t59
,
t60
,
t61
#
)
uTup62id
(
#
x00
,
x01
,
x02
,
x03
,
x04
,
x05
,
x06
,
x07
,
x08
,
x09
,
x10
,
x11
,
x12
,
x13
,
x14
,
x15
,
x16
,
x17
,
x18
,
x19
,
x20
,
x21
,
x22
,
x23
,
x24
,
x25
,
x26
,
x27
,
x28
,
x29
,
x30
,
x31
,
x32
,
x33
,
x34
,
x35
,
x36
,
x37
,
x38
,
x39
,
x40
,
x41
,
x42
,
x43
,
x44
,
x45
,
x46
,
x47
,
x48
,
x49
,
x50
,
x51
,
x52
,
x53
,
x54
,
x55
,
x56
,
x57
,
x58
,
x59
,
x60
,
x61
#
)
=
(
#
x00
,
x01
,
x02
,
x03
,
x04
,
x05
,
x06
,
x07
,
x08
,
x09
,
x10
,
x11
,
x12
,
x13
,
x14
,
x15
,
x16
,
x17
,
x18
,
x19
,
x20
,
x21
,
x22
,
x23
,
x24
,
x25
,
x26
,
x27
,
x28
,
x29
,
x30
,
x31
,
x32
,
x33
,
x34
,
x35
,
x36
,
x37
,
x38
,
x39
,
x40
,
x41
,
x42
,
x43
,
x44
,
x45
,
x46
,
x47
,
x48
,
x49
,
x50
,
x51
,
x52
,
x53
,
x54
,
x55
,
x56
,
x57
,
x58
,
x59
,
x60
,
x61
#
)
testsuite/tests/rename/should_compile/all.T
View file @
5a1ce45d
...
...
@@ -172,3 +172,4 @@ test('T15957', normal, compile, ['-Werror -Wredundant-record-wildcards -Wunused-
test
('
T17244A
',
normal
,
compile
,
['
-Wno-error=compat-unqualified-imports
'])
test
('
T17244B
',
normal
,
compile
,
[''])
test
('
T17244C
',
normal
,
compile
,
[''])
test
('
T17837
',
normal
,
compile
,
[''])
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment