Commit d4ded7a0 authored by Simon Peyton Jones's avatar Simon Peyton Jones
Browse files

Merge branch 'master' of http://darcs.haskell.org/ghc

parents 406a369f e06ffb5e
......@@ -293,6 +293,12 @@
compilation error will occur. A simple way to think of this is a
<emphasis>same origin policy</emphasis> for overlapping instances
defined in Safe compiled modules.</listitem>
<listitem><emphasis>Data.Typeable</emphasis> &mdash; We restrict Typeable
instances to only derived ones (offered by GHC through the
<link linkend="deriving-typeable"><option>-XDeriveDataTypeable</option>
</link> extension). Hand crafted instances of the Typeable type class
are not allowed in Safe Haskell as this can easily be abused to
unsafely coerce between types.</listitem>
</itemizedlist>
</sect2>
......
......@@ -512,7 +512,6 @@ INLINE_HEADER void traceSparkCounters(Capability *cap STG_UNUSED)
if (RTS_UNLIKELY(TRACE_spark_sampled)) {
traceSparkCounters_(cap, cap->spark_stats, sparkPoolSize(cap->sparks));
}
#endif
dtraceSparkCounters((EventCapNo)cap->no,
cap->spark_stats.created,
cap->spark_stats.dud,
......@@ -521,6 +520,7 @@ INLINE_HEADER void traceSparkCounters(Capability *cap STG_UNUSED)
cap->spark_stats.gcd,
cap->spark_stats.fizzled,
sparkPoolSize(cap->sparks));
#endif
}
INLINE_HEADER void traceEventSparkCreate(Capability *cap STG_UNUSED)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment