--- /dev/null	2018-02-03 04:43:52.625000053 -0500
+++ new/src/hotspot/share/ci/ciMethodType.cpp	2018-03-12 22:05:46.271920860 -0400
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "ci/ciInstance.hpp"
+#include "ci/ciMethodType.hpp"
+#include "ci/ciUtilities.inline.hpp"
+#include "classfile/javaClasses.hpp"
+
+ciType* ciMethodType::class_to_citype(oop klass_oop) const {
+  if (java_lang_Class::is_primitive(klass_oop)) {
+    BasicType bt = java_lang_Class::primitive_type(klass_oop);
+    return ciType::make(bt);
+  } else {
+    Klass* k = java_lang_Class::as_Klass(klass_oop);
+    return CURRENT_ENV->get_klass(k);
+  }
+}
+
+ciType* ciMethodType::rtype() const {
+  GUARDED_VM_ENTRY(
+    oop rtype = java_lang_invoke_MethodType::rtype(get_oop());
+    return class_to_citype(rtype);
+  )
+}
+
+int ciMethodType::ptype_count() const {
+  GUARDED_VM_ENTRY(return java_lang_invoke_MethodType::ptype_count(get_oop());)
+}
+
+int ciMethodType::ptype_slot_count() const {
+  GUARDED_VM_ENTRY(return java_lang_invoke_MethodType::ptype_slot_count(get_oop());)
+}
+
+ciType* ciMethodType::ptype_at(int index) const {
+  GUARDED_VM_ENTRY(
+    oop ptype = java_lang_invoke_MethodType::ptype(get_oop(), index);
+    return class_to_citype(ptype);
+  )
+}