diff options
author | Ian Lynagh <igloo@earth.li> | 2009-02-06 14:02:49 +0000 |
---|---|---|
committer | Ian Lynagh <igloo@earth.li> | 2009-02-06 14:02:49 +0000 |
commit | 497302c44ad08c6c27d0e15d94a787f332c0cfec (patch) | |
tree | a78fd252a39c2d49b5a5219a2c968004c5a1c029 /compiler/codeGen/CgHpc.hs | |
parent | 1353826e5159c9a5a81e75e0b7459271f27c08ea (diff) | |
download | haskell-497302c44ad08c6c27d0e15d94a787f332c0cfec.tar.gz |
When generating C, don't pretend functions are data
We used to generated things like:
extern StgWordArray (newCAF) __attribute__((aligned (8)));
((void (*)(void *))(W_)&newCAF)((void *)R1.w);
(which is to say, pretend that newCAF is some data, then cast it to a
function and call it).
This goes wrong on at least IA64, where:
A function pointer on the ia64 does not point to the first byte of
code. Intsead, it points to a structure that describes the function.
The first quadword in the structure is the address of the first byte
of code
so we end up dereferencing function pointers one time too many, and
segfaulting.
Diffstat (limited to 'compiler/codeGen/CgHpc.hs')
-rw-r--r-- | compiler/codeGen/CgHpc.hs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/codeGen/CgHpc.hs b/compiler/codeGen/CgHpc.hs index 9ae576944b..faee9c2d3f 100644 --- a/compiler/codeGen/CgHpc.hs +++ b/compiler/codeGen/CgHpc.hs @@ -21,6 +21,9 @@ import FastString import HscTypes import Panic import Char +import StaticFlags +import BasicTypes +import PackageConfig import Data.Word @@ -66,7 +69,7 @@ initHpc this_mod (HpcInfo tickCount hashNo) PlayRisky [CmmHinted id NoHint] (CmmCallee - (CmmLit $ CmmLabel $ mkForeignLabel mod_alloc Nothing False) + (CmmLit $ CmmLabel $ mkForeignLabel mod_alloc Nothing False IsFunction) CCallConv ) [ CmmHinted (mkLblExpr mkHpcModuleNameLabel) AddrHint |