summaryrefslogtreecommitdiff
path: root/compiler/GHC/Cmm
diff options
context:
space:
mode:
authorEric Lindblad <lindblad@gmx.us>2022-09-13 10:31:23 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-09-14 03:13:56 -0400
commit646d15ad8f1119f339998ee8dd79ea96cfd1d165 (patch)
tree84bc30035fb31ea0f418384b2399400d53539cbf /compiler/GHC/Cmm
parentdc6af9ed87e619d754bfc385df931c81cba6d93a (diff)
downloadhaskell-646d15ad8f1119f339998ee8dd79ea96cfd1d165.tar.gz
Fix typos
This fixes various typos and spelling mistakes in the compiler. Fixes #21891
Diffstat (limited to 'compiler/GHC/Cmm')
-rw-r--r--compiler/GHC/Cmm/CLabel.hs4
-rw-r--r--compiler/GHC/Cmm/ContFlowOpt.hs2
-rw-r--r--compiler/GHC/Cmm/Dataflow.hs2
-rw-r--r--compiler/GHC/Cmm/Liveness.hs2
-rw-r--r--compiler/GHC/Cmm/Sink.hs6
-rw-r--r--compiler/GHC/Cmm/Switch.hs2
6 files changed, 9 insertions, 9 deletions
diff --git a/compiler/GHC/Cmm/CLabel.hs b/compiler/GHC/Cmm/CLabel.hs
index 5a969d30f5..b718b73f30 100644
--- a/compiler/GHC/Cmm/CLabel.hs
+++ b/compiler/GHC/Cmm/CLabel.hs
@@ -1,6 +1,6 @@
-----------------------------------------------------------------------------
--
--- Object-file symbols (called CLabel for histerical raisins).
+-- Object-file symbols (called CLabel for historical reasons).
--
-- (c) The University of Glasgow 2004-2006
--
@@ -612,7 +612,7 @@ mkClosureTableLabel :: Name -> CafInfo -> CLabel
mkConInfoTableLabel :: Name -> ConInfoTableLocation -> CLabel
mkBytesLabel :: Name -> CLabel
mkClosureLabel name c = IdLabel name c Closure
--- | Decicdes between external and local labels based on the names externality.
+-- | Decides between external and local labels based on the names externality.
mkInfoTableLabel name c
| isExternalName name = IdLabel name c InfoTable
| otherwise = IdLabel name c LocalInfoTable
diff --git a/compiler/GHC/Cmm/ContFlowOpt.hs b/compiler/GHC/Cmm/ContFlowOpt.hs
index 350f94c818..a9bb7b673e 100644
--- a/compiler/GHC/Cmm/ContFlowOpt.hs
+++ b/compiler/GHC/Cmm/ContFlowOpt.hs
@@ -334,7 +334,7 @@ blockConcat splitting_procs g@CmmGraph { g_entry = entry_id }
In this case we could assume that we will end up with a jump for BOTH
branches. In this case it might be best to put the likely path in the true
branch especially if there are large numbers of predecessors as this saves
- us the jump thats not taken. However I haven't tested this and as of early
+ us the jump that's not taken. However I haven't tested this and as of early
2018 we almost never generate cmm where this would apply.
-}
diff --git a/compiler/GHC/Cmm/Dataflow.hs b/compiler/GHC/Cmm/Dataflow.hs
index edd91481e7..1e5376e2bf 100644
--- a/compiler/GHC/Cmm/Dataflow.hs
+++ b/compiler/GHC/Cmm/Dataflow.hs
@@ -87,7 +87,7 @@ type TransferFun' (n :: Extensibility -> Extensibility -> Type) f =
Block n C C -> FactBase f -> FactBase f
--- | Function for rewrtiting and analysis combined. To be used with
+-- | Function for rewriting and analysis combined. To be used with
-- @rewriteCmm@.
--
-- Currently set to work with @UniqSM@ monad, but we could probably abstract
diff --git a/compiler/GHC/Cmm/Liveness.hs b/compiler/GHC/Cmm/Liveness.hs
index 769c701c2b..c7d3217959 100644
--- a/compiler/GHC/Cmm/Liveness.hs
+++ b/compiler/GHC/Cmm/Liveness.hs
@@ -103,7 +103,7 @@ xferLive platform (BlockCC eNode middle xNode) fBase =
-----------------------------------------------------------------------------
-- | Specialization that only retains the keys for local variables.
--
--- Local variablas are mostly glorified Ints, and some parts of the compiler
+-- Local variables are mostly glorified Ints, and some parts of the compiler
-- really don't care about anything but the Int part. So we can avoid some
-- overhead by computing a IntSet instead of a Set LocalReg which (unsurprisingly)
-- is quite a bit faster.
diff --git a/compiler/GHC/Cmm/Sink.hs b/compiler/GHC/Cmm/Sink.hs
index 68b20fd307..9ad5c455ac 100644
--- a/compiler/GHC/Cmm/Sink.hs
+++ b/compiler/GHC/Cmm/Sink.hs
@@ -360,7 +360,7 @@ loads from R1. What happens is that we:
* The assignment `_c3 = [R1 + 1]`; (R1 already inlined on pickup)
conflicts with R1 = R1, because it reads `R1` and the node writes
to R1
- * This is clearly no-sensical because `R1 = R1` doesn't affect R1's value.
+ * This is clearly nonsensical because `R1 = R1` doesn't affect R1's value.
The solutions is to check if we can discard nodes before and *after* simplifying
them. We could only do it after as well, but I assume doing it early might save
@@ -490,7 +490,7 @@ tryToInline platform liveAfter node assigs =
where (final_node, rest') = go usages live' node' (insertLRegSet l skipped) rest
-- Avoid discarding of assignments to vars on the rhs.
- -- See Note [Keeping assignemnts mentioned in skipped RHSs]
+ -- See Note [Keeping assignments mentioned in skipped RHSs]
-- usages' = foldLocalRegsUsed platform (\m r -> addToUFM m r 2)
-- usages rhs
live' = inline foldLocalRegsUsed platform (\m r -> insertLRegSet r m)
@@ -518,7 +518,7 @@ tryToInline platform liveAfter node assigs =
inl_exp (CmmMachOp op args) = cmmMachOpFold platform op args
inl_exp other = other
-{- Note [Keeping assignemnts mentioned in skipped RHSs]
+{- Note [Keeping assignments mentioned in skipped RHSs]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
If we have to assignments: [z = y, y = e1] and we skip
z we *must* retain the assignment y = e1. This is because
diff --git a/compiler/GHC/Cmm/Switch.hs b/compiler/GHC/Cmm/Switch.hs
index b0f22ce1b3..f03eaac70f 100644
--- a/compiler/GHC/Cmm/Switch.hs
+++ b/compiler/GHC/Cmm/Switch.hs
@@ -365,7 +365,7 @@ breakTooSmall m
--- Step 3: Fill in the blanks
---
--- | A FlatSwitchPlan is a list of SwitchPlans, with an integer inbetween every
+-- | A FlatSwitchPlan is a list of SwitchPlans, with an integer in between every
-- two entries, dividing the range.
-- So if we have (abusing list syntax) [plan1,n,plan2], then we use plan1 if
-- the expression is < n, and plan2 otherwise.