core/org.openjdk.jmc.agent/src/main/java/org/openjdk/jmc/agent/jfr/impl/JFRMethodAdvisor.java [54:123]:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
			String name, String desc) {
		super(api, mv, access, name, desc);
		this.transformDescriptor = transformDescriptor;
		// These are not accessible from the super type (made private), so must save an extra reference. :/
		this.argumentTypesRef = Type.getArgumentTypes(desc);
		this.returnTypeRef = Type.getReturnType(desc);
		this.eventType = Type.getObjectType(transformDescriptor.getEventClassName());
	}

	@Override
	protected void onMethodEnter() {
		createEvent();
	}

	private void createEvent() {
		mv.visitTypeInsn(NEW, transformDescriptor.getEventClassName());
		mv.visitInsn(DUP);
		mv.visitInsn(DUP);
		mv.visitMethodInsn(INVOKESPECIAL, transformDescriptor.getEventClassName(), "<init>", "()V", false); //$NON-NLS-1$ //$NON-NLS-2$
		for (Parameter param : transformDescriptor.getParameters()) {
			if (!param.isReturn()) {
				Type argumentType = argumentTypesRef[param.getIndex()];
				if (transformDescriptor.isAllowedFieldType(argumentType)) {
					mv.visitInsn(DUP);
					loadArg(param.getIndex());
					writeParameter(param, argumentType);
				}
			}
		}

		mv.visitMethodInsn(INVOKEVIRTUAL, transformDescriptor.getEventClassName(), "begin", "()V", false); //$NON-NLS-1$ //$NON-NLS-2$
		eventLocal = newLocal(eventType);
		mv.visitVarInsn(ASTORE, eventLocal);
	}

	private void writeParameter(Parameter param, Type type) {
		if (TypeUtils.shouldStringify(param, type)) {
			TypeUtils.stringify(mv, param, type);
			type = TypeUtils.STRING_TYPE;
		}
		putField(Type.getObjectType(transformDescriptor.getEventClassName()), param.getFieldName(), type);
	}

	@Override
	protected void onMethodExit(int opcode) {
		if (returnTypeRef.getSort() != Type.VOID && opcode != ATHROW) {
			Parameter returnParam = TypeUtils.findReturnParam(transformDescriptor.getParameters());
			if (returnParam != null) {
				emitSettingReturnParam(opcode, returnParam);
			}
		}
		commitEvent();
	}

	private void emitSettingReturnParam(int opcode, Parameter returnParam) {
		if (returnTypeRef.getSize() == 1) {
			dup();
			mv.visitVarInsn(ALOAD, eventLocal);
			swap();
		} else {
			dup2();
			mv.visitVarInsn(ALOAD, eventLocal);
			dupX2();
			pop();
		}
		writeParameter(returnParam, returnTypeRef);
	}

	private void commitEvent() {
		mv.visitVarInsn(ALOAD, eventLocal);
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -



core/org.openjdk.jmc.agent/src/main/java/org/openjdk/jmc/agent/jfrnext/impl/JFRNextMethodAdvisor.java [53:122]:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
			String name, String desc) {
		super(api, mv, access, name, desc);
		this.transformDescriptor = transformDescriptor;
		// These are not accessible from the super type (made private), so must save an extra reference. :/
		this.argumentTypesRef = Type.getArgumentTypes(desc);
		this.returnTypeRef = Type.getReturnType(desc);
		this.eventType = Type.getObjectType(transformDescriptor.getEventClassName());
	}

	@Override
	protected void onMethodEnter() {
		createEvent();
	}

	private void createEvent() {
		mv.visitTypeInsn(NEW, transformDescriptor.getEventClassName());
		mv.visitInsn(DUP);
		mv.visitInsn(DUP);
		mv.visitMethodInsn(INVOKESPECIAL, transformDescriptor.getEventClassName(), "<init>", "()V", false); //$NON-NLS-1$ //$NON-NLS-2$
		for (Parameter param : transformDescriptor.getParameters()) {
			if (!param.isReturn()) {
				Type argumentType = argumentTypesRef[param.getIndex()];
				if (transformDescriptor.isAllowedFieldType(argumentType)) {
					mv.visitInsn(DUP);
					loadArg(param.getIndex());
					writeParameter(param, argumentType);
				}
			}
		}

		mv.visitMethodInsn(INVOKEVIRTUAL, transformDescriptor.getEventClassName(), "begin", "()V", false); //$NON-NLS-1$ //$NON-NLS-2$
		eventLocal = newLocal(eventType);
		mv.visitVarInsn(ASTORE, eventLocal);
	}

	private void writeParameter(Parameter param, Type type) {
		if (TypeUtils.shouldStringify(param, type)) {
			TypeUtils.stringify(mv, param, type);
			type = TypeUtils.STRING_TYPE;
		}
		putField(Type.getObjectType(transformDescriptor.getEventClassName()), param.getFieldName(), type);
	}

	@Override
	protected void onMethodExit(int opcode) {
		if (returnTypeRef.getSort() != Type.VOID && opcode != ATHROW) {
			Parameter returnParam = TypeUtils.findReturnParam(transformDescriptor.getParameters());
			if (returnParam != null) {
				emitSettingReturnParam(opcode, returnParam);
			}
		}
		commitEvent();
	}

	private void emitSettingReturnParam(int opcode, Parameter returnParam) {
		if (returnTypeRef.getSize() == 1) {
			dup();
			mv.visitVarInsn(ALOAD, eventLocal);
			swap();
		} else {
			dup2();
			mv.visitVarInsn(ALOAD, eventLocal);
			dupX2();
			pop();
		}
		writeParameter(returnParam, returnTypeRef);
	}

	private void commitEvent() {
		mv.visitVarInsn(ALOAD, eventLocal);
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -



