Merge: Do not inline lazy getter

nitc-sg's aggressive inlining caused a stack overflow during the compilation of recursive lazy attributes

Needed to pass #1011

Pull-Request: #1044

diff --git a/src/compiler/abstract_compiler.nit b/src/compiler/abstract_compiler.nit
index 2f58f29..d1441d2 100644 (file)
--- a/src/compiler/abstract_compiler.nit
+++ b/src/compiler/abstract_compiler.nit
@@ -2199,6 +2199,8 @@ redef class AMethPropdef
 end
 
 redef class AAttrPropdef
+       redef fun can_inline: Bool do return not is_lazy
+
        redef fun compile_to_c(v, mpropdef, arguments)
        do
                if mpropdef == mreadpropdef then

diff --git a/tests/base_attr_lazy3.nit b/tests/base_attr_lazy3.nit
new file mode 100644 (file)
index 0000000..e0679bc
--- /dev/null
+++ b/tests/base_attr_lazy3.nit
@@ -0,0 +1,37 @@
+# This file is part of NIT ( http://www.nitlanguage.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
+
+class A
+       var prev: nullable A
+       var value: Int is lazy do
+               if prev == null then return 0
+               var v = prev.value + 1
+               v.output
+               return v
+       end
+end
+
+var a0 = new A(null)
+var a1 = new A(a0)
+var a2 = new A(a1)
+var a3 = new A(a2)
+
+'\n'.output
+a2.value.output
+'\n'.output
+a1.value.output
+'\n'.output
+a3.value.output

diff --git a/tests/sav/base_attr_lazy3.res b/tests/sav/base_attr_lazy3.res
new file mode 100644 (file)
index 0000000..ab373e6
--- /dev/null
+++ b/tests/sav/base_attr_lazy3.res
@@ -0,0 +1,9 @@
+
+1
+2
+2
+
+1
+
+3
+3