Merge branch '6.1.0' into 6.1

# Conflicts: # loader/build.xml # loader/pom.xml # test/tickets/LDEV4899.cfc
lucee · Jun 16, 2024 · 58f84cd · 58f84cd
2 parents adab7b8 + bb9ca47
commit 58f84cd
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 17 deletions.
diff --git a/core/src/main/java/lucee/transformer/bytecode/expression/AsExpression.java b/core/src/main/java/lucee/transformer/bytecode/expression/AsExpression.java
@@ -0,0 +1,7 @@
+package lucee.transformer.bytecode.expression;
+
+import lucee.transformer.bytecode.Statement;
+
+public interface AsExpression {
+	public Statement getStatement();
+}
diff --git a/core/src/main/java/lucee/transformer/bytecode/expression/ComponentAsExpression.java b/core/src/main/java/lucee/transformer/bytecode/expression/ComponentAsExpression.java
@@ -10,13 +10,14 @@
 import lucee.runtime.functions.other.CreateUniqueId;
 import lucee.transformer.TransformerException;
 import lucee.transformer.bytecode.BytecodeContext;
+import lucee.transformer.bytecode.Statement;
 import lucee.transformer.bytecode.statement.tag.Attribute;
 import lucee.transformer.bytecode.statement.tag.TagComponent;
 import lucee.transformer.bytecode.util.Types;
 import lucee.transformer.cfml.Data;
 import lucee.transformer.cfml.evaluator.EvaluatorException;
 
-public class ComponentAsExpression extends ExpressionBase {
+public class ComponentAsExpression extends ExpressionBase implements AsExpression {
 	private static final Type COMPONENT_LOADER = Type.getType(ComponentLoader.class);
 	// ComponentImpl loadInline(PageContext pc, CIPage page)
 	private static final Method LOAD_INLINE1 = new Method("loadInline", Types.COMPONENT_IMPL, new Type[] { Types.CI_PAGE });
@@ -74,4 +75,9 @@ public Type _writeOut(BytecodeContext bc, int mode) throws TransformerException
 	public TagComponent getTagComponent() {
 		return tc;
 	}
+
+	@Override
+	public Statement getStatement() {
+		return tc;
+	}
 }
diff --git a/core/src/main/java/lucee/transformer/bytecode/expression/FunctionAsExpression.java b/core/src/main/java/lucee/transformer/bytecode/expression/FunctionAsExpression.java
@@ -21,10 +21,11 @@
 
 import lucee.transformer.TransformerException;
 import lucee.transformer.bytecode.BytecodeContext;
+import lucee.transformer.bytecode.Statement;
 import lucee.transformer.bytecode.statement.udf.Function;
 import lucee.transformer.bytecode.util.Types;
 
-public class FunctionAsExpression extends ExpressionBase {
+public class FunctionAsExpression extends ExpressionBase implements AsExpression {
 
 	private Function function;
 
@@ -45,4 +46,8 @@ public Type _writeOut(BytecodeContext bc, int mode) throws TransformerException
 	public Function getFunction() {
 		return function;
 	}
+
+	public Statement getStatement() {
+		return function;
+	}
 }
diff --git a/core/src/main/java/lucee/transformer/bytecode/op/OpElvis.java b/core/src/main/java/lucee/transformer/bytecode/op/OpElvis.java
@@ -32,6 +32,7 @@
 import lucee.runtime.op.Elvis;
 import lucee.transformer.TransformerException;
 import lucee.transformer.bytecode.BytecodeContext;
+import lucee.transformer.bytecode.expression.AsExpression;
 import lucee.transformer.bytecode.expression.ExpressionBase;
 import lucee.transformer.bytecode.util.ASMUtil;
 import lucee.transformer.bytecode.util.Types;
@@ -54,7 +55,9 @@ public final class OpElvis extends ExpressionBase {
 
 	@Override
 	public Type _writeOut(BytecodeContext bc, int mode) throws TransformerException {
-		if (ASMUtil.hasOnlyDataMembers(left)) return _writeOutPureDataMember(bc, mode);
+		// FUTURE this is just a patch, for unknown reason the assignment of inline component or closures
+		// causes a issue, most likely in the way the object uses the stack
+		if (ASMUtil.hasOnlyDataMembers(left) && !(right instanceof AsExpression)) return _writeOutPureDataMember(bc, mode);
 
 		String name = createRandom(bc);
 		GeneratorAdapter ga = bc.getAdapter();

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.1.1.2-SNAPSHOT"/>
+  <property name="version" value="6.1.1.3-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.1.1.2-SNAPSHOT</version>
+  <version>6.1.1.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>

diff --git a/test/tickets/LDEV4899.cfc b/test/tickets/LDEV4899.cfc
@@ -1,12 +1,52 @@
-component extends="org.lucee.cfml.test.LuceeTestCase" labels="syntax" skip=true{
-
-	function run( testResults, testBox ) {
-		describe("Testcase for LDEV-4899 - compiler crash", function() {
-			it( title="lucee.runtime.type.Closure not found by org.objectweb.asm", body=function( currentSpec ) {
-				expect( function(){
-					//var prop = args.prop  ?: function(){ return "" };
-				}).notToThrow();
-			});
-		}); 
-	}
-}
+component extends = "org.lucee.cfml.test.LuceeTestCase" labels="struct" {
+
+    function run( testResults, testBox ) {
+        describe( "Testcase for LDEV-4899", function() {
+            it( title="testing elvis with default closure", skip="true", body=function( currentSpec ) {
+                var prop = a.b.c   ?: function(){ return "" };
+            });
+            it( title="testing elvis with default lambda", skip="true", body=function( currentSpec ) {
+                var prop = a.b.c   ?: () => "susi";
+            });
+
+            it( title="testing elvis with default array", skip="true", body=function( currentSpec ) {
+                var prop = a.b.c   ?: [1,2,3];
+            });
+
+            it( title="testing elvis with default struct", skip="true", body=function( currentSpec ) {
+                var prop = a.b.c   ?: {a:1};
+            });
+
+            it( title="testing elvis with default component", skip="true", body=function( currentSpec ) {
+                var prop = a.b.c   ?: new Query();
+            });
+
+            it( title="testing elvis with default inline component", skip="true", body=function( currentSpec ) {
+                var prop = a.b.c   ?: new component {};
+            });
+
+
+            it( title="testing elvis with default array of closure", skip="true", body=function( currentSpec ) {
+                var prop = a.b.c   ?: [function(){ return "" }];
+            });
+            it( title="testing elvis with default  array of lambda", skip="true", body=function( currentSpec ) {
+                var prop = a.b.c   ?: [() => "susi"];
+            });
+
+            it( title="testing elvis with default  array of struct", skip="true", body=function( currentSpec ) {
+                var prop = a.b.c   ?: [{a:1}];
+            });
+
+            it( title="testing elvis with default  array of component", skip="true", body=function( currentSpec ) {
+                var prop = a.b.c   ?: [new Query()];
+            });
+
+            it( title="testing elvis with default  array of inline component", skip="true", body=function( currentSpec ) {
+                var prop = a.b.c   ?: [new component {}];
+            });
+
+
+
+        });
+    }
+}