From dea3987ca52699b64b0a08bd7b4e719b5f7b5356 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Wed, 22 Apr 2009 00:44:06 -0500
Subject: [PATCH] Silly workaround for performance regression
---
basis/compiler/tree/builder/builder.factor | 5 +++++
basis/hints/hints.factor | 21 +++++++++++++--------
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/basis/compiler/tree/builder/builder.factor b/basis/compiler/tree/builder/builder.factor
index 7a9877a406..3f00a3bb68 100644
--- a/basis/compiler/tree/builder/builder.factor
+++ b/basis/compiler/tree/builder/builder.factor
@@ -52,6 +52,11 @@ PRIVATE>
[ f ] dip build-tree-with ;
:: build-sub-tree ( #call word/quot -- nodes/f )
+ #! We don't want methods on mixins to have a declaration for that mixin.
+ #! This slows down compiler.tree.propagation.inlining since then every
+ #! inlined usage of a method has an inline-dependency on the mixin, and
+ #! not the more specific type at the call site.
+ specialize-method? off
[
#call in-d>> word/quot build-tree-with unclip-last in-d>> :> in-d
{
diff --git a/basis/hints/hints.factor b/basis/hints/hints.factor
index ed55c1c332..d445bf72ad 100644
--- a/basis/hints/hints.factor
+++ b/basis/hints/hints.factor
@@ -2,9 +2,9 @@
! See http://factorcode.org/license.txt for BSD license.
USING: parser words definitions kernel sequences assocs arrays
kernel.private fry combinators accessors vectors strings sbufs
-byte-arrays byte-vectors io.binary io.streams.string splitting
-math math.parser generic generic.standard generic.standard.engines classes
-hashtables ;
+byte-arrays byte-vectors io.binary io.streams.string splitting math
+math.parser generic generic.standard generic.standard.engines classes
+hashtables namespaces ;
IN: hints
GENERIC: specializer-predicate ( spec -- quot )
@@ -37,13 +37,18 @@ M: object specializer-declaration class ;
: specialize-quot ( quot specializer -- quot' )
specializer-cases alist>quot ;
-: method-declaration ( method -- quot )
- [ "method-generic" word-prop dispatch# object <array> ]
- [ "method-class" word-prop ]
- bi prefix ;
+! compiler.tree.propagation.inlining sets this to f
+SYMBOL: specialize-method?
+
+t specialize-method? set-global
: specialize-method ( quot method -- quot' )
- [ method-declaration '[ _ declare ] prepend ]
+ [
+ specialize-method? get [
+ [ "method-class" word-prop ] [ "method-generic" word-prop ] bi
+ method-declaration prepend
+ ] [ drop ] if
+ ]
[ "method-generic" word-prop "specializer" word-prop ] bi
[ specialize-quot ] when* ;