Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
GHC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
4,323
Issues
4,323
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
388
Merge Requests
388
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
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
Glasgow Haskell Compiler
GHC
Commits
da69358b
Commit
da69358b
authored
Dec 26, 2015
by
eir@cis.upenn.edu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix
#11287
.
Happily, the fix is simply deleting some old code. I love it when that happens.
parent
52da6bdc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
11 deletions
+3
-11
compiler/coreSyn/CoreUtils.hs
compiler/coreSyn/CoreUtils.hs
+1
-1
compiler/typecheck/TcMatches.hs
compiler/typecheck/TcMatches.hs
+1
-9
testsuite/tests/th/all.T
testsuite/tests/th/all.T
+1
-1
No files found.
compiler/coreSyn/CoreUtils.hs
View file @
da69358b
...
@@ -616,7 +616,7 @@ refineDefaultAlt us tycon tys imposs_deflt_cons all_alts
...
@@ -616,7 +616,7 @@ refineDefaultAlt us tycon tys imposs_deflt_cons all_alts
-- Check for no data constructors
-- Check for no data constructors
-- This can legitimately happen for abstract types and type families,
-- This can legitimately happen for abstract types and type families,
-- so don't report that
-- so don't report that
=
pprTrace
"prepareDefault"
(
ppr
tycon
)
(
False
,
all_alts
)
=
(
False
,
all_alts
)
|
otherwise
-- The common case
|
otherwise
-- The common case
=
(
False
,
all_alts
)
=
(
False
,
all_alts
)
...
...
compiler/typecheck/TcMatches.hs
View file @
da69358b
...
@@ -117,13 +117,6 @@ tcMatchesCase :: (Outputable (body Name)) =>
...
@@ -117,13 +117,6 @@ tcMatchesCase :: (Outputable (body Name)) =>
-- wrapper goes from MatchGroup's ty to expected ty
-- wrapper goes from MatchGroup's ty to expected ty
tcMatchesCase
ctxt
scrut_ty
matches
res_ty
tcMatchesCase
ctxt
scrut_ty
matches
res_ty
|
isEmptyMatchGroup
matches
-- Allow empty case expressions
=
return
(
MG
{
mg_alts
=
noLoc
[]
,
mg_arg_tys
=
[
scrut_ty
]
,
mg_res_ty
=
res_ty
,
mg_origin
=
mg_origin
matches
})
|
otherwise
=
do
{
res_ty
<-
tauifyMultipleMatches
matches
res_ty
=
do
{
res_ty
<-
tauifyMultipleMatches
matches
res_ty
;
tcMatches
ctxt
[
scrut_ty
]
res_ty
matches
}
;
tcMatches
ctxt
[
scrut_ty
]
res_ty
matches
}
...
@@ -220,8 +213,7 @@ data TcMatchCtxt body -- c.f. TcStmtCtxt, also in this module
...
@@ -220,8 +213,7 @@ data TcMatchCtxt body -- c.f. TcStmtCtxt, also in this module
tcMatches
ctxt
pat_tys
rhs_ty
(
MG
{
mg_alts
=
L
l
matches
tcMatches
ctxt
pat_tys
rhs_ty
(
MG
{
mg_alts
=
L
l
matches
,
mg_origin
=
origin
})
,
mg_origin
=
origin
})
=
ASSERT
(
not
(
null
matches
)
)
-- Ensure that rhs_ty is filled in
=
do
{
matches'
<-
mapM
(
tcMatch
ctxt
pat_tys
rhs_ty
)
matches
do
{
matches'
<-
mapM
(
tcMatch
ctxt
pat_tys
rhs_ty
)
matches
;
return
(
MG
{
mg_alts
=
L
l
matches'
;
return
(
MG
{
mg_alts
=
L
l
matches'
,
mg_arg_tys
=
pat_tys
,
mg_arg_tys
=
pat_tys
,
mg_res_ty
=
rhs_ty
,
mg_res_ty
=
rhs_ty
...
...
testsuite/tests/th/all.T
View file @
da69358b
...
@@ -272,7 +272,7 @@ test('T7532',
...
@@ -272,7 +272,7 @@ test('T7532',
['
T7532
',
'
-v0
'
+
config
.
ghc_th_way_flags
])
['
T7532
',
'
-v0
'
+
config
.
ghc_th_way_flags
])
test
('
T2222
',
normal
,
compile
,
['
-v0
'])
test
('
T2222
',
normal
,
compile
,
['
-v0
'])
test
('
T1849
',
normal
,
ghci_script
,
['
T1849.script
'])
test
('
T1849
',
normal
,
ghci_script
,
['
T1849.script
'])
test
('
T7681
',
when
(
compiler_debugged
(),
expect_broken
(
11287
))
,
compile
,
['
-v0
'])
test
('
T7681
',
normal
,
compile
,
['
-v0
'])
test
('
T7910
',
normal
,
compile_and_run
,
['
-v0
'])
test
('
T7910
',
normal
,
compile_and_run
,
['
-v0
'])
test
('
ClosedFam1TH
',
normal
,
compile
,
['
-dsuppress-uniques -v0
'])
test
('
ClosedFam1TH
',
normal
,
compile
,
['
-dsuppress-uniques -v0
'])
...
...
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