diff options
Diffstat (limited to 'compiler/codeGen')
| -rw-r--r-- | compiler/codeGen/CgCon.lhs | 6 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmCon.hs | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/compiler/codeGen/CgCon.lhs b/compiler/codeGen/CgCon.lhs index b50ba8d779..26489e5945 100644 --- a/compiler/codeGen/CgCon.lhs +++ b/compiler/codeGen/CgCon.lhs @@ -69,11 +69,9 @@ cgTopRhsCon :: Id -- Name of thing bound to this RHS -> FCode (Id, CgIdInfo) cgTopRhsCon id con args = do { dflags <- getDynFlags - ; when (platformOS (targetPlatform dflags) == OSMinGW32) $ do { + ; when (platformOS (targetPlatform dflags) == OSMinGW32) $ -- Windows DLLs have a problem with static cross-DLL refs. - ; this_pkg <- getThisPackage - ; ASSERT( not (isDllConApp this_pkg con args) ) return () - } + ASSERT( not (isDllConApp dflags con args) ) return () ; ASSERT( args `lengthIs` dataConRepArity con ) return () -- LAY IT OUT diff --git a/compiler/codeGen/StgCmmCon.hs b/compiler/codeGen/StgCmmCon.hs index 28c99b98a7..a357db4d05 100644 --- a/compiler/codeGen/StgCmmCon.hs +++ b/compiler/codeGen/StgCmmCon.hs @@ -59,11 +59,9 @@ cgTopRhsCon :: Id -- Name of thing bound to this RHS cgTopRhsCon id con args = do { dflags <- getDynFlags - ; when (platformOS (targetPlatform dflags) == OSMinGW32) $ do { + ; when (platformOS (targetPlatform dflags) == OSMinGW32) $ -- Windows DLLs have a problem with static cross-DLL refs. - this_pkg <- getThisPackage - ; ASSERT( not (isDllConApp this_pkg con args) ) return () - } + ASSERT( not (isDllConApp dflags con args) ) return () ; ASSERT( args `lengthIs` dataConRepArity con ) return () -- LAY IT OUT |