diff options
| author | Adam Gundry <adam@well-typed.com> | 2015-10-16 13:58:52 +0100 |
|---|---|---|
| committer | Adam Gundry <adam@well-typed.com> | 2015-10-16 13:58:52 +0100 |
| commit | 5a1b4f814f74ec1c48152d97523744518e212777 (patch) | |
| tree | 7c2207ecacbd37f12c78dbcf9d4334827164e0fb /compiler/rename/RnSource.hs | |
| parent | 6757950cdd8bb0af0355539987ee78401a6a8f6b (diff) | |
| parent | 808bbdf08058785ae5bc59b5b4f2b04951d4cbbf (diff) | |
| download | haskell-wip/orf-reboot.tar.gz | |
Merge remote-tracking branch 'origin/master' into wip/orf-rebootwip/orf-reboot
Conflicts:
compiler/rename/RnNames.hs
compiler/typecheck/TcRnMonad.hs
utils/haddock
Diffstat (limited to 'compiler/rename/RnSource.hs')
| -rw-r--r-- | compiler/rename/RnSource.hs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/compiler/rename/RnSource.hs b/compiler/rename/RnSource.hs index 18eb24dfbf..f89f1b2ceb 100644 --- a/compiler/rename/RnSource.hs +++ b/compiler/rename/RnSource.hs @@ -391,8 +391,8 @@ rnHsForeignDecl (ForeignImport name ty _ spec) ; (ty', fvs) <- rnLHsType (ForeignDeclCtx name) ty -- Mark any PackageTarget style imports as coming from the current package - ; let packageKey = thisPackage $ hsc_dflags topEnv - spec' = patchForeignImport packageKey spec + ; let unitId = thisPackage $ hsc_dflags topEnv + spec' = patchForeignImport unitId spec ; return (ForeignImport name' ty' noForeignImportCoercionYet spec', fvs) } @@ -409,21 +409,21 @@ rnHsForeignDecl (ForeignExport name ty _ spec) -- package, so if they get inlined across a package boundry we'll still -- know where they're from. -- -patchForeignImport :: PackageKey -> ForeignImport -> ForeignImport -patchForeignImport packageKey (CImport cconv safety fs spec src) - = CImport cconv safety fs (patchCImportSpec packageKey spec) src +patchForeignImport :: UnitId -> ForeignImport -> ForeignImport +patchForeignImport unitId (CImport cconv safety fs spec src) + = CImport cconv safety fs (patchCImportSpec unitId spec) src -patchCImportSpec :: PackageKey -> CImportSpec -> CImportSpec -patchCImportSpec packageKey spec +patchCImportSpec :: UnitId -> CImportSpec -> CImportSpec +patchCImportSpec unitId spec = case spec of - CFunction callTarget -> CFunction $ patchCCallTarget packageKey callTarget + CFunction callTarget -> CFunction $ patchCCallTarget unitId callTarget _ -> spec -patchCCallTarget :: PackageKey -> CCallTarget -> CCallTarget -patchCCallTarget packageKey callTarget = +patchCCallTarget :: UnitId -> CCallTarget -> CCallTarget +patchCCallTarget unitId callTarget = case callTarget of StaticTarget src label Nothing isFun - -> StaticTarget src label (Just packageKey) isFun + -> StaticTarget src label (Just unitId) isFun _ -> callTarget {- |