--- a/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp	Fri Aug 31 16:39:35 2012 -0700
+++ b/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp	Sat Sep 01 13:25:18 2012 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -133,9 +133,6 @@
       output()->print("null");
     } else if (!value->is_loaded()) {
       output()->print("<unloaded object " PTR_FORMAT ">", value);
-    } else if (value->is_method()) {
-      ciMethod* m = (ciMethod*)value;
-      output()->print("<method %s.%s>", m->holder()->name()->as_utf8(), m->name()->as_utf8());
     } else {
       output()->print("<object " PTR_FORMAT " klass=", value->constant_encoding());
       print_klass(value->klass());
@@ -159,6 +156,9 @@
     }
     output()->print("class ");
     print_klass(klass);
+  } else if (type->as_MethodConstant() != NULL) {
+    ciMethod* m = type->as_MethodConstant()->value();
+    output()->print("<method %s.%s>", m->holder()->name()->as_utf8(), m->name()->as_utf8());
   } else {
     output()->print("???");
   }
@@ -461,7 +461,10 @@
   output()->print("type_cast(");
   print_value(x->obj());
   output()->print(") ");
-  print_klass(x->declared_type()->klass());
+  if (x->declared_type()->is_klass())
+    print_klass(x->declared_type()->as_klass());
+  else
+    output()->print(type2name(x->declared_type()->basic_type()));
 }