LDEV-6303 drop duplicate re-fire, restore deep-copy contract; defer Hibernate LDEV-4121 fix to extension

Author: zspitzer

core/src/main/java/lucee/runtime/ComponentImpl.java

@@ -57,7 +57,6 @@
 import lucee.runtime.component.ComponentLoader;
 import lucee.runtime.component.ComponentPageRef;
 import lucee.runtime.component.DataMember;
-import lucee.runtime.component.ExpressionDefaultSeeder;
 import lucee.runtime.component.ImportDefintion;
 import lucee.runtime.component.Member;
 import lucee.runtime.component.MetaDataSoftReference;
@@ -368,8 +367,6 @@ public ComponentImpl _duplicate(boolean deepCopy, boolean isTop) {
 				if (useShadow) {
 					addUDFS(trg, ((ComponentScopeShadow) scope).getShadow(), ((ComponentScopeShadow) trg.scope).getShadow());
 				}
-
-				reFireExpressionDefaults(trg);
 			}
 		}
 		finally {
@@ -379,41 +376,6 @@ public ComponentImpl _duplicate(boolean deepCopy, boolean isTop) {
 		return trg;
 	}
 
-	private static void reFireExpressionDefaults(ComponentImpl trg) {
-		PageContext pc = ThreadLocalPageContext.get();
-		if (pc == null) return;
-
-		Variables prevVars = pc.variablesScope();
-		try {
-			if (trg.scope instanceof Variables) pc.setVariablesScope((Variables) trg.scope);
-
-			ComponentImpl walker = trg;
-			while (walker != null) {
-				if (walker.pageSource != null) {
-					try {
-						lucee.runtime.Page page = walker.pageSource.loadPage(pc, false);
-						if (page instanceof ExpressionDefaultSeeder) {
-							try {
-								((ExpressionDefaultSeeder) page)._seedExpressionDefaults(pc);
-							}
-							catch (Throwable t) {
-								ExceptionUtil.rethrowIfNecessary(t);
-								throw new lucee.runtime.exp.PageRuntimeException(Caster.toPageException(t));
-							}
-						}
-					}
-					catch (PageException pe) {
-						throw new lucee.runtime.exp.PageRuntimeException(pe);
-					}
-				}
-				walker = (ComponentImpl) walker.base;
-			}
-		}
-		finally {
-			if (prevVars != null) pc.setVariablesScope(prevVars);
-		}
-	}
-
 	private static void addUDFS(ComponentImpl trgComp, Map src, Map trg) {
 		if (!src.isEmpty()) {
 			Iterator it = src.entrySet().iterator();
@@ -2480,9 +2442,12 @@ else if (propOwnerPS == null) {
 		}
 
 		top.properties.properties.put(propNameLower, propImpl);
-		if (propImpl.getDefaultAsObject() != null) {
+		Object defaultObj = propImpl.getDefaultAsObject();
+		if (defaultObj != null && !(defaultObj instanceof lucee.runtime.component.ExpressionDefault)) {
+			// Expression-form defaults are seeded by the pseudo-constructor's inline emission
+			// (see TagProperty.emitExpressionEvalAndSet); only literal defaults are eager-set here.
 			Key propKey = propImpl.getNameAsKey();
-			scope.setEL(propKey, propImpl.getDefaultAsObject());
+			scope.setEL(propKey, defaultObj);
 			if (ownPropertyDefaults == null) ownPropertyDefaults = new HashSet<>();
 			ownPropertyDefaults.add(propKey);
 		}

core/src/main/java/lucee/runtime/component/ExpressionDefaultSeeder.java

@@ -380,17 +380,7 @@ public byte[] execute(String className) throws TransformerException {
 		String[] interfaces = null;
 		if (isComponent(comp)) {
 			parent = ComponentPageImpl.class.getName();// "lucee/runtime/ComponentPage";
-			List<TagProperty> exprDefProps = collectExpressionFormProperties(comp);
-			boolean hasExprDefaults = !exprDefProps.isEmpty();
-			if (isSub && hasExprDefaults) {
-				interfaces = new String[] { SubPage.class.getName().replace('.', '/'), "lucee/runtime/component/ExpressionDefaultSeeder" };
-			}
-			else if (isSub) {
-				interfaces = new String[] { SubPage.class.getName().replace('.', '/') };
-			}
-			else if (hasExprDefaults) {
-				interfaces = new String[] { "lucee/runtime/component/ExpressionDefaultSeeder" };
-			}
+			if (isSub) interfaces = new String[] { SubPage.class.getName().replace('.', '/') };
 		}
 		else if (isInterface(comp)) parent = InterfacePageImpl.class.getName();// "lucee/runtime/InterfacePage";
 		parent = parent.replace('.', '/');
@@ -775,8 +765,6 @@ else if (functions.length <= 10) {
 		// newInstance/initComponent/call
 		writeOutStatic(optionalPS, constr, keys, cw, comp, className);
 
-		writeOutSeedExpressionDefaults(optionalPS, constr, keys, cw, comp, className);
-
 		// set field subs
 		FieldVisitor fv = cw.visitField(Opcodes.ACC_PRIVATE, "subs", "[Llucee/runtime/CIPage;", null, null);
 		fv.visitEnd();
@@ -1561,47 +1549,6 @@ else if (defaultExpr instanceof LitBooleanImpl) {
 
 	}
 
-	private static List<TagProperty> collectExpressionFormProperties(TagCIObject component) {
-		List<TagProperty> result = new ArrayList<TagProperty>();
-		if (component == null || component.getBody() == null) return result;
-		List<Statement> statements = component.getBody().getStatements();
-		if (statements == null) return result;
-		for (Statement stmt: statements) {
-			if (!(stmt instanceof TagProperty)) continue;
-			TagProperty tagProp = (TagProperty) stmt;
-			Attribute defaultAttr = tagProp.getAttribute("default");
-			if (defaultAttr == null || defaultAttr.getValue() == null) continue;
-			Expression defaultExpr = defaultAttr.getValue();
-			if (defaultExpr instanceof LitStringImpl || defaultExpr instanceof LitNumberImpl || defaultExpr instanceof LitBooleanImpl) continue;
-			Attribute nameAttr = tagProp.getAttribute("name");
-			if (nameAttr == null || nameAttr.getValue() == null) continue;
-			result.add(tagProp);
-		}
-		return result;
-	}
-
-	private void writeOutSeedExpressionDefaults(PageSource optionalPS, ConstrBytecodeContext constr, Map<LitString, Integer> keys, ClassWriter cw, TagCIObject component,
-			String name) throws TransformerException {
-		List<TagProperty> exprDefProps = collectExpressionFormProperties(component);
-		if (exprDefProps.isEmpty()) return;
-
-		Method seedMethod = new Method("_seedExpressionDefaults", Types.VOID, new Type[] { Types.PAGE_CONTEXT });
-		GeneratorAdapter ga = new GeneratorAdapter(Opcodes.ACC_PUBLIC, seedMethod, null, new Type[] { Types.THROWABLE }, cw);
-		BytecodeContext bc = new BytecodeContext(config, optionalPS, constr, this, keys, cw, name, ga, seedMethod, writeLog(), suppressWSbeforeArg, output, returnValue,
-				sourceCode.getSourceOffset());
-
-		for (TagProperty tagProp: exprDefProps) {
-			Attribute nameAttr = tagProp.getAttribute("name");
-			Attribute defaultAttr = tagProp.getAttribute("default");
-			String propName = nameAttr.getValue() instanceof Literal ? ((Literal) nameAttr.getValue()).getString() : null;
-			if (propName == null) continue;
-			TagProperty.emitExpressionEvalAndSet(bc, propName, defaultAttr.getValue());
-		}
-
-		ga.returnValue();
-		ga.endMethod();
-	}
-
 	private String getTagAttributeValue(Tag tag, String attrName) {
 		Attribute attr = tag.getAttribute(attrName);
 		if (attr != null && attr.getValue() != null) {

core/src/main/java/lucee/transformer/bytecode/PageImpl.java

@@ -75,11 +75,9 @@ public void _writeOut(BytecodeContext bc) throws TransformerException {
 		bc.visitLine(tag.getEnd());
 	}
 
-	/**
-	 * Emits eval + variablesScope.setEL bytecode for a single cfproperty expression-form default.
-	 * Shared by construction-time pseudo-constructor and the duplicate-time _seedExpressionDefaults
-	 * method so both paths emit identical eval bytecode and stay in lockstep.
-	 */
+	/** Emits eval + variablesScope.setEL bytecode for one cfproperty expression-form default,
+	 *  inline in the pseudo-constructor. Slot is empty at this point — ComponentImpl skips
+	 *  eager-setting the wrapper into scope at init for expression-form defaults. */
 	public static void emitExpressionEvalAndSet(BytecodeContext bc, String propName, Expression defaultExpr) throws TransformerException {
 		final GeneratorAdapter adapter = bc.getAdapter();
 		defaultExpr.writeOut(bc, Expression.MODE_REF);

core/src/main/java/lucee/transformer/bytecode/statement/tag/TagProperty.java

@@ -362,110 +362,46 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="orm" {
 
 			});
 
-			describe( "duplicate() re-fires expression-form defaults — fresh per-instance evaluation", function(){
+			describe( "duplicate() — deep-copy semantic, no re-fire (option 6 contract)", function(){
+				// Core duplicate is a deep copy of state, not a re-construction. Hibernate (which
+				// needs fresh per-entity evaluation) handles its template→entity re-firing at the
+				// extension layer. See test/functions/Duplicate.cfc for the broader user-mutation
+				// preservation contract.
 
-				it( "duplicate fires fresh #now()# — dup gets a later timestamp than src after sleep", function(){
-					// Contract: duplicate re-fires expression-form defaults so each duplicate
-					// gets a fresh per-instance evaluation. The natural reading of
-					// default="#now()#" is "the time this instance came into existence" — and
-					// duplicates ARE new instances coming into existence.
-					var src = new LDEV6303.ExpressionDefaultsCfc();
-					sleep( 1100 );
-					var dup = duplicate( src );
-
-					expect( dateCompare( dup.getNowDef(), src.getNowDef(), "s" ) ).toBeGT( 0,
-						"duplicate must re-evaluate now() — dup's timestamp should be later than src's"
-					);
-				});
-
-				it( "duplicate fires fresh #createUUID()# — dup's UUID differs from src's", function(){
-					var src = new LDEV6303.ExpressionDefaultsCfc();
-					var dup = duplicate( src );
-
-					expect( dup.getUuidDef() ).notToBe( src.getUuidDef(),
-						"duplicate must re-evaluate createUUID() — dup gets a fresh UUID"
-					);
-					// sanity: both look like UUIDs
-					expect( len( dup.getUuidDef() ) ).toBeGT( 0 );
-					expect( len( src.getUuidDef() ) ).toBeGT( 0 );
-				});
-
-				it( "duplicate fires fresh deterministic expression (eval gives same value but separate computation)", function(){
-					// Deterministic expressions naturally give the same value either way.
-					// This test documents that they continue to work — fresh eval of
-					// repeatString('x',5) gives "xxxxx" same as src's value.
+				it( "deterministic expression-form value round-trips through duplicate as deep copy", function(){
 					var src = new LDEV6303.ExpressionDefaultsCfc();
 					var dup = duplicate( src );
 					expect( dup.getExpressionDef() ).toBe( "xxxxx" );
 					expect( dup.getExpressionDef() ).toBe( src.getExpressionDef() );
 				});
 
-				it( "duplicate gives dup its own array — mutating dup does not leak to src", function(){
-					// Mutable expression-form defaults (#[]#, #{}#) must produce a fresh
-					// container per duplicate. Without re-fire, a shallow-copy duplicate
-					// would share the array reference with src — silent leak.
+				it( "deep duplicate gives dup its own array — mutating dup does not leak to src", function(){
+					// Even without re-fire, deep duplicate must give dup a fresh array reference
+					// (Duplicator.duplicate handles container deep-copy).
 					var src = new LDEV6303.ExpressionDefaultsCfc();
 					var dup = duplicate( src );
 
 					arrayAppend( dup.getFreshArrayDef(), "added-to-dup" );
 
 					expect( arrayLen( src.getFreshArrayDef() ) ).toBe( 0,
-						"src's array must be unaffected by mutation on dup's array (separate references via re-fire)"
+						"src's array must be unaffected by mutation on dup's deep-copy array"
 					);
 					expect( arrayLen( dup.getFreshArrayDef() ) ).toBe( 1 );
 				});
 
-				it( "duplicate(src, false) — shallow duplicate also re-fires expression-form (Hibernate path)", function(){
-					// Hibernate's CFCInstantiator uses cfc.duplicate(false) to create
-					// entity instances. The shallow flag must NOT prevent re-fire of
-					// expression-form defaults — otherwise every entity from a cached
-					// template gets the template's frozen UUID/now/[]/{}.
-					var src = new LDEV6303.ExpressionDefaultsCfc();
-					var dup = duplicate( src, false );
-
-					expect( dup.getUuidDef() ).notToBe( src.getUuidDef(),
-						"duplicate(src, false) must re-evaluate expression-form defaults too"
-					);
-
-					// Mutation on dup's struct must not leak to src
-					var s = dup.getNowStructDef();
-					s.n = 999;
-
-					expect( src.getNowStructDef().n ).toBe( 1,
-						"src's struct must be a separate reference from dup's (no shared-ref leak via shallow duplicate)"
-					);
-				});
-
-				it( "explicit assignment after duplicate still wins — user values aren't clobbered by re-fire", function(){
-					// Re-fire seeds dup's scope at duplicate-time. Subsequent explicit
-					// assignment by the user must override the re-fire'd value.
+				it( "explicit assignment after duplicate wins over the deep-copied value", function(){
 					var src = new LDEV6303.ExpressionDefaultsCfc();
 					var dup = duplicate( src );
 
 					var freshTs = now();
 					dup.setNowDef( freshTs );
 
-					expect( dateCompare( dup.getNowDef(), freshTs, "s" ) ).toBe( 0,
-						"explicit setNowDef on dup must win over re-fire'd value"
-					);
+					expect( dateCompare( dup.getNowDef(), freshTs, "s" ) ).toBe( 0 );
 					expect( dateCompare( src.getNowDef(), freshTs, "s" ) ).toBeLTE( 0,
 						"src's nowDef must be unchanged by mutation on the duplicate"
 					);
 				});
 
-				it( "inherited expression-form default re-fires on the child duplicate", function(){
-					// Child class instance, inheriting a #now()# default from parent.
-					// duplicate of the child must re-fire the parent's expression-form
-					// default — inheritance walk in _duplicate.
-					var src = new LDEV6303.ChildExprDefCfc();
-					sleep( 1100 );
-					var dup = duplicate( src );
-
-					expect( dateCompare( dup.getParentNowDef(), src.getParentNowDef(), "s" ) ).toBeGT( 0,
-						"inherited #now()# default must re-fire on the child's duplicate"
-					);
-				});
-
 			});
 
 			describe( "serializeJson shape — programmatic discriminability for consumers", function(){