Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
GHC
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gesh
GHC
Commits
132c92f7
Commit
132c92f7
authored
26 years ago
by
sof
Browse files
Options
Downloads
Patches
Plain Diff
[project @ 1998-08-14 12:06:08 by sof]
Updates to reflect changes elsewhere
parent
bd9eee13
Loading
Loading
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ghc/compiler/simplCore/SimplCore.lhs
+5
-5
5 additions, 5 deletions
ghc/compiler/simplCore/SimplCore.lhs
ghc/compiler/simplCore/SimplPgm.lhs
+1
-2
1 addition, 2 deletions
ghc/compiler/simplCore/SimplPgm.lhs
ghc/compiler/simplCore/Simplify.lhs
+4
-4
4 additions, 4 deletions
ghc/compiler/simplCore/Simplify.lhs
with
10 additions
and
11 deletions
ghc/compiler/simplCore/SimplCore.lhs
+
5
−
5
View file @
132c92f7
...
...
@@ -27,7 +27,7 @@ import CoreSyn
import CoreUtils ( coreExprType )
import SimplUtils ( etaCoreExpr, typeOkForCase )
import CoreUnfold
import Literal ( Literal(..), literalType, mkMachInt )
import Literal ( Literal(..), literalType, mkMachInt
, mkMachInt_safe
)
import ErrUtils ( ghcExit, dumpIfSet, doIfSet )
import FiniteMap ( FiniteMap, emptyFM )
import FloatIn ( floatInwards )
...
...
@@ -482,10 +482,10 @@ tidyCoreArg (TyArg ty) = tidyTy ty `thenTM` \ ty' ->
\end{code}
\begin{code}
tidyPrimOp (CCallOp fn casm gc tys ty)
tidyPrimOp (CCallOp fn casm gc
cconv
tys ty)
= mapTM tidyTy tys `thenTM` \ tys' ->
tidyTy ty `thenTM` \ ty' ->
returnTM (CCallOp fn casm gc tys' ty')
returnTM (CCallOp fn casm gc
cconv
tys' ty')
tidyPrimOp other_prim_op = returnTM other_prim_op
\end{code}
...
...
@@ -513,7 +513,7 @@ litToRep (NoRepStr s)
then -- Must cater for NULs in literal string
mkGenApp (Var unpackCString2Id)
[LitArg (MachStr s),
LitArg (mkMachInt (toInteger (_LENGTH_ s)))]
LitArg (mkMachInt
_safe
(toInteger (_LENGTH_ s)))]
else -- No NULs in the string
App (Var unpackCStringId) (LitArg (MachStr s))
...
...
@@ -536,7 +536,7 @@ litToRep (NoRepInteger i integer_ty)
| i > tARGET_MIN_INT && -- Small enough, so start from an Int
i < tARGET_MAX_INT
= Prim Int2IntegerOp [LitArg (mkMachInt
i
)]
= Prim Int2IntegerOp [LitArg (mkMachInt
(fromInteger i)
)]
| otherwise -- Big, so start from a string
= Prim Addr2IntegerOp [LitArg (MachStr (_PK_ (show i)))]
...
...
This diff is collapsed.
Click to expand it.
ghc/compiler/simplCore/SimplPgm.lhs
+
1
−
2
View file @
132c92f7
...
...
@@ -25,10 +25,9 @@ import UniqSupply ( thenUs, returnUs, mapUs,
splitUniqSupply, UniqSM,
UniqSupply
)
import Util ( isIn, isn'tIn, removeDups )
import Util ( isIn, isn'tIn, removeDups
, trace
)
import Outputable
import GlaExts ( trace )
\end{code}
\begin{code}
...
...
This diff is collapsed.
Click to expand it.
ghc/compiler/simplCore/Simplify.lhs
+
4
−
4
View file @
132c92f7
...
...
@@ -275,10 +275,10 @@ simplExpr env (Prim op prim_args) args result_ty
where
-- PrimOps just need any types in them renamed.
simpl_op (CCallOp label is_asm may_gc arg_tys result_ty)
simpl_op (CCallOp label is_asm may_gc
cconv
arg_tys result_ty)
= mapEager (simplTy env) arg_tys `appEager` \ arg_tys' ->
simplTy env result_ty `appEager` \ result_ty' ->
returnEager (CCallOp label is_asm may_gc arg_tys' result_ty')
returnEager (CCallOp label is_asm may_gc
cconv
arg_tys' result_ty')
simpl_op other_op = returnEager other_op
\end{code}
...
...
@@ -327,8 +327,8 @@ simplExpr env tylam@(Lam (TyBinder tyvar) body) [] result_ty
returnSmpl (Lam (TyBinder tyvar') body')
#ifdef DEBUG
simplExpr env (Lam (TyBinder _) _) (_ : _) result_ty
= panic "simplExpr:TyLam with non-TyArg"
simplExpr env
e@
(Lam (TyBinder _) _)
args@
(_ : _) result_ty
= p
prP
anic "simplExpr:TyLam with non-TyArg"
(ppr e $$ ppr args)
#endif
\end{code}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment