summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2014-12-17 12:36:07 +0100
committerGabor Greif <ggreif@gmail.com>2014-12-17 12:56:00 +0100
commitc9a02287a5cd14b71ac8a97711e018e9daa0abfc (patch)
tree560b6054e6624d08b842a9b015fde7793b36b5a2
parent3745f421753bb9e3d87e7166c866930c8385fa5d (diff)
downloadhaskell-c9a02287a5cd14b71ac8a97711e018e9daa0abfc.tar.gz
Typos in comments
-rw-r--r--compiler/codeGen/StgCmmMonad.hs2
-rw-r--r--testsuite/tests/codeGen/should_compile/Makefile4
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/codeGen/StgCmmMonad.hs b/compiler/codeGen/StgCmmMonad.hs
index fff8e28654..f7a13f9c98 100644
--- a/compiler/codeGen/StgCmmMonad.hs
+++ b/compiler/codeGen/StgCmmMonad.hs
@@ -285,7 +285,7 @@ data ReturnKind
-- clean up.
--
-- There are some rarer cases of common blocks that we don't catch
--- this way, but that's ok. Common-block-elimation is still available
+-- this way, but that's ok. Common-block-elimination is still available
-- to catch them when optimisation is enabled. Some examples are:
--
-- - when both the True and False branches do a heap check, we
diff --git a/testsuite/tests/codeGen/should_compile/Makefile b/testsuite/tests/codeGen/should_compile/Makefile
index b186e0d923..412c9029c9 100644
--- a/testsuite/tests/codeGen/should_compile/Makefile
+++ b/testsuite/tests/codeGen/should_compile/Makefile
@@ -19,8 +19,8 @@ debug:
> debug.cmm
cat debug.cmm | grep -o src\<debug.hs:.*\> | sort -u
- # Common block elimination should elimation should merge the
- # blocks corresponding to alternatives 1 and 2, therefore there
+ # Common block elimination should merge the blocks
+ # corresponding to alternatives 1 and 2, therefore there
# must be a block containing exactly these two annotations
# directly next to each other.
echo == CBE ==