diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-06-11 15:24:27 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-06-11 15:37:04 -0700 |
| commit | bac927b9770ff769128b66d13a3e72bf5a9bc514 (patch) | |
| tree | dab91026af349d00b0ff352304091d17359c8d70 /compiler/main/GhcMake.hs | |
| parent | 28e04de37151f05c35377ec74ac214d0cfa2f521 (diff) | |
| download | haskell-bac927b9770ff769128b66d13a3e72bf5a9bc514.tar.gz | |
Revert "Support for multiple signature files in scope."
This reverts commit a7524eaed33324e2155c47d4a705bef1d70a2b5b.
Diffstat (limited to 'compiler/main/GhcMake.hs')
| -rw-r--r-- | compiler/main/GhcMake.hs | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs index 89cab9ef3a..2d1d9ebf52 100644 --- a/compiler/main/GhcMake.hs +++ b/compiler/main/GhcMake.hs @@ -1815,10 +1815,7 @@ findSummaryBySourceFile summaries file [] -> Nothing (x:_) -> Just x --- | Summarise a module, and pick up source and timestamp. --- Returns @Nothing@ if the module is excluded via @excl_mods@ or is an --- external package module (which we don't compile), otherwise returns the --- new module summary (or an error saying why we couldn't summarise it). +-- Summarise a module, and pick up source and timestamp. summariseModule :: HscEnv -> NodeMap ModSummary -- Map of old summaries @@ -1880,10 +1877,7 @@ summariseModule hsc_env old_summary_map is_boot (L loc wanted_mod) uncacheModule hsc_env wanted_mod found <- findImportedModule hsc_env wanted_mod Nothing case found of - -- TODO: When we add -alias support, we can validly find - -- multiple signatures in the home package; need to make this - -- logic more flexible in that case. - FoundModule (FoundHs { fr_loc = location, fr_mod = mod }) + Found location mod | isJust (ml_hs_file location) -> -- Home package just_found location mod @@ -1892,15 +1886,6 @@ summariseModule hsc_env old_summary_map is_boot (L loc wanted_mod) ASSERT(modulePackageKey mod /= thisPackage dflags) return Nothing - FoundSigs hs _backing - | Just (FoundHs { fr_loc = location, fr_mod = mod }) - <- find (isJust . ml_hs_file . fr_loc) hs -> - just_found location mod - | otherwise -> - ASSERT(all (\h -> modulePackageKey (fr_mod h) - /= thisPackage dflags) hs) - return Nothing - err -> return $ Just $ Left $ noModError dflags loc wanted_mod err -- Not found |