--- /dev/null	2016-10-31 17:47:22.000000000 -0700
+++ new/src/share/vm/aot/compiledIC_aot.hpp	2016-10-31 17:47:22.000000000 -0700
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2016, 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.
+ */
+
+#ifndef SHARE_VM_AOT_COMPILEDIC_AOT_HPP
+#define SHARE_VM_AOT_COMPILEDIC_AOT_HPP
+
+#include "code/nativeInst.hpp"
+#include "interpreter/linkResolver.hpp"
+#include "oops/compiledICHolder.hpp"
+#include "code/compiledIC.hpp"
+
+class CompiledPltStaticCall: public CompiledStaticCall {
+  friend class CompiledIC;
+  friend class PltNativeCallWrapper;
+
+  // Also used by CompiledIC
+  void set_to_interpreted(methodHandle callee, address entry);
+
+  address instruction_address() const { return _call->instruction_address(); }
+  void set_destination_mt_safe(address dest) { _call->set_destination_mt_safe(dest); }
+
+  NativePltCall* _call;
+
+  CompiledPltStaticCall(NativePltCall* call) : _call(call) {}
+
+ public:
+
+  inline static CompiledPltStaticCall* before(address return_addr) {
+    CompiledPltStaticCall* st = new CompiledPltStaticCall(nativePltCall_before(return_addr));
+    st->verify();
+    return st;
+  }
+
+  static inline CompiledPltStaticCall* at(address native_call) {
+    CompiledPltStaticCall* st = new CompiledPltStaticCall(nativePltCall_at(native_call));
+    st->verify();
+    return st;
+  }
+
+  static inline CompiledPltStaticCall* at(Relocation* call_site) {
+    return at(call_site->addr());
+  }
+
+  // Delegation
+  address destination() const { return _call->destination(); }
+
+  virtual bool is_call_to_interpreted() const;
+
+  // Stub support
+  address find_stub();
+  static void set_stub_to_clean(static_stub_Relocation* static_stub);
+
+  // Misc.
+  void print()  PRODUCT_RETURN;
+  void verify() PRODUCT_RETURN;
+
+ protected:
+  virtual address resolve_call_stub() const { return _call->plt_resolve_call(); }
+  virtual void set_to_far(methodHandle callee, address entry) { set_to_compiled(entry); }
+  virtual const char* name() const { return "CompiledPltStaticCall"; }
+};
+
+#endif // SHARE_VM_AOT_COMPILEDIC_AOT_HPP