--- a/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp	Fri Aug 31 16:39:35 2012 -0700
+++ b/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp	Sat Sep 01 13:25:18 2012 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, 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
@@ -27,7 +27,7 @@
 
 #include "c1/c1_CodeStubs.hpp"
 #include "ci/ciMethodData.hpp"
-#include "oops/methodDataOop.hpp"
+#include "oops/methodData.hpp"
 #include "utilities/top.hpp"
 
 class Compilation;
@@ -84,6 +84,9 @@
   void jobject2reg(jobject o, Register reg);
   void jobject2reg_with_patching(Register reg, CodeEmitInfo* info);
 
+  void metadata2reg(Metadata* o, Register reg);
+  void klass2reg_with_patching(Register reg, CodeEmitInfo* info);
+
   void emit_stubs(CodeStubList* stub_list);
 
   // addresses