From: Jean Privat <jean@pryen.org>
Date: Mon, 10 Aug 2009 18:54:41 +0000 (-0400)
Subject: compile: force inlining with special class Inline__
X-Git-Tag: v0.3~63
X-Git-Url: http://nitlanguage.org

compile: force inlining with special class Inline__

Signed-off-by: Jean Privat <jean@pryen.org>
---

diff --git a/src/analysis/inline_methods.nit b/src/analysis/inline_methods.nit
index 0e37bec..a661452 100644
--- a/src/analysis/inline_methods.nit
+++ b/src/analysis/inline_methods.nit
@@ -63,7 +63,8 @@ redef class ICall
 		var cn = m.local_class.name
 		return (m.is_intern and cn != once ("Object".to_symbol)) or
 			(cn == (once ("Array".to_symbol)) and (mn == (once ("length".to_symbol)) or mn == (once ("[]".to_symbol)))) or
-			(cn == (once ("AbstractArrayRead".to_symbol)) and (mn == (once ("length".to_symbol)) or mn == (once ("[]".to_symbol))))
+			(cn == (once ("AbstractArrayRead".to_symbol)) and (mn == (once ("length".to_symbol)) or mn == (once ("[]".to_symbol)))) or
+			(m.global.intro.local_class.name == (once ("Inline__".to_symbol)))
 	end
 end
 
diff --git a/tests/base_inline.nit b/tests/base_inline.nit
new file mode 100644
index 0000000..1e85bb6
--- /dev/null
+++ b/tests/base_inline.nit
@@ -0,0 +1,40 @@
+# This file is part of NIT ( http://www.nitlanguage.org ).
+#
+# Copyright 2009 Jean Privat <jean@pryen.org>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import kernel
+
+interface Inline__
+	fun foo do 1.output
+	fun bar: Int = 2
+end
+
+class A
+special Inline__
+	redef fun bar do return 20
+	fun baz do 3.output
+end
+
+class B
+special A
+	redef fun foo do 100.output
+	redef fun bar do return 200
+	redef fun baz do 300.output
+end
+
+var a: A = new B
+a.foo
+a.bar.output
+a.baz
diff --git a/tests/sav/base_inline.sav b/tests/sav/base_inline.sav
new file mode 100644
index 0000000..2536278
--- /dev/null
+++ b/tests/sav/base_inline.sav
@@ -0,0 +1,3 @@
+1
+20
+300