[commit: ghc] master: Remove some old commented out code in StgLint (20f9056)

git at git.haskell.org git at git.haskell.org
Thu Apr 14 14:18:11 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/20f905609aaab29b80247e85c96d50e8d697dae0/ghc

>---------------------------------------------------------------

commit 20f905609aaab29b80247e85c96d50e8d697dae0
Author: Bartosz Nitka <niteria at gmail.com>
Date:   Thu Apr 14 06:09:17 2016 -0700

    Remove some old commented out code in StgLint
    
    This looks like some traces of an experiment to check if shadowing is good for
    STG. The code refers to things that don't exist anymore and this part of
    code hasn't been touched for ages, so I think this should be safe to
    remove.
    
    Test Plan: just comments
    
    Reviewers: austin, bgamari, simonpj
    
    Reviewed By: simonpj
    
    Subscribers: thomie, simonmar
    
    Differential Revision: https://phabricator.haskell.org/D2114


>---------------------------------------------------------------

20f905609aaab29b80247e85c96d50e8d697dae0
 compiler/stgSyn/StgLint.hs | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/compiler/stgSyn/StgLint.hs b/compiler/stgSyn/StgLint.hs
index dd206d9..b3f7182 100644
--- a/compiler/stgSyn/StgLint.hs
+++ b/compiler/stgSyn/StgLint.hs
@@ -348,19 +348,9 @@ addLoc extra_loc m = LintM $ \loc scope errs
 
 addInScopeVars :: [Id] -> LintM a -> LintM a
 addInScopeVars ids m = LintM $ \loc scope errs
- -> -- We check if these "new" ids are already
-    -- in scope, i.e., we have *shadowing* going on.
-    -- For now, it's just a "trace"; we may make
-    -- a real error out of it...
-    let
+ -> let
         new_set = mkVarSet ids
-    in
---  After adding -fliberate-case, Simon decided he likes shadowed
---  names after all.  WDP 94/07
---  (if isEmptyVarSet shadowed
---  then id
---  else pprTrace "Shadowed vars:" (ppr (varSetElems shadowed))) $
-    unLintM m loc (scope `unionVarSet` new_set) errs
+    in unLintM m loc (scope `unionVarSet` new_set) errs
 
 {-
 Checking function applications: we only check that the type has the



More information about the ghc-commits mailing list