diff options
author | 2014-02-14 04:00:03 -0500 | |
---|---|---|
committer | 2014-02-14 04:00:03 -0500 | |
commit | 62a18826a55b49f8f3a371a5dca09e203b9e6d2a (patch) | |
tree | 33bd2d11b2a2be4e188ac79abcdbfa4df2e2d199 /src/mono_reduce.sml | |
parent | 1f074cea18228f4100972f7b51f68cd12db15f60 (diff) | |
parent | 5537bc4338b4a576b225810c5cca34d3ca7de87f (diff) |
Merge in upstream
Diffstat (limited to 'src/mono_reduce.sml')
-rw-r--r-- | src/mono_reduce.sml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mono_reduce.sml b/src/mono_reduce.sml index 846a878b..c92ce5aa 100644 --- a/src/mono_reduce.sml +++ b/src/mono_reduce.sml @@ -395,10 +395,11 @@ fun reduce (file : file) = fun mayInline (n, e, t, s) = case IM.find (uses, n) of NONE => false - | SOME count => count <= 1 - orelse size e <= Settings.getMonoInline () - orelse functionInside t - orelse Settings.checkAlwaysInline s + | SOME count => not (Settings.checkNeverInline s) + andalso (count <= 1 + orelse size e <= Settings.getMonoInline () + orelse functionInside t + orelse Settings.checkAlwaysInline s) fun summarize d (e, _) = let |