--- /dev/null	2017-11-09 09:38:01.297999907 +0100
+++ new/src/jdk.jfr/share/classes/jdk/jfr/internal/EventWriterMethod.java	2018-04-09 15:58:30.022539864 +0200
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jfr.internal;
+
+import jdk.internal.org.objectweb.asm.commons.Method;
+import jdk.jfr.internal.EventInstrumentation.FieldInfo;
+
+public enum EventWriterMethod {
+
+    BEGIN_EVENT("(" + jdk.internal.org.objectweb.asm.Type.getType(PlatformEventType.class).getDescriptor() + ")Z", "???", "beginEvent"),
+    END_EVENT("()Z", "???", "endEvent"),
+    PUT_BYTE("(B)V", "byte", "putByte"),
+    PUT_SHORT("(S)V", "short", "putShort"),
+    PUT_INT("(I)V", "int", "putInt"),
+    PUT_LONG("(J)V", "long", "putLong"),
+    PUT_FLOAT("(F)V", "float", "putFloat"),
+    PUT_DOUBLE("(D)V", "double", "putDouble"),
+    PUT_CHAR("(C)V", "char", "putChar"),
+    PUT_BOOLEAN("(Z)V", "boolean", "putBoolean"),
+    PUT_THREAD("(Ljava/lang/Thread;)V", Type.THREAD.getName(), "putThread"),
+    PUT_CLASS("(Ljava/lang/Class;)V", Type.CLASS.getName(), "putClass"),
+    PUT_STRING("(Ljava/lang/String;Ljdk/jfr/internal/StringPool;)V", Type.STRING.getName(), "putString"),
+    PUT_EVENT_THREAD("()V", Type.THREAD.getName(), "putEventThread"),
+    PUT_STACK_TRACE("()V", Type.ORACLE_TYPE_PREFIX + "StackTrace", "putStackTrace");
+
+    private final Method asmMethod;
+    private final String typeDescriptor;
+
+    EventWriterMethod(String paramSignature, String typeName, String methodName) {
+        this.typeDescriptor = ASMToolkit.getDescriptor(typeName);
+        this.asmMethod = new Method(methodName, paramSignature);
+    }
+
+    public Method asASM() {
+        return asmMethod;
+    }
+
+    /**
+     * Return method in {@link EventWriter} class to use when writing event of
+     * a certain type.
+     *
+     * @param v field info
+     *
+     * @return the method
+     */
+    public static EventWriterMethod lookupMethod(FieldInfo v) {
+        // event thread
+        if (v.fieldName.equals(EventInstrumentation.FIELD_EVENT_THREAD)) {
+            return EventWriterMethod.PUT_EVENT_THREAD;
+        }
+        for (EventWriterMethod m : EventWriterMethod.values()) {
+            if (v.fieldDescriptor.equals(m.typeDescriptor)) {
+                return m;
+            }
+        }
+        throw new Error("Unknown type " + v.fieldDescriptor);
+    }
+}