diff --git a/include/llvm/Assembly/Writer.h b/include/llvm/Assembly/Writer.h
index 0fbb695a63d..f883312966a 100644
--- a/include/llvm/Assembly/Writer.h
+++ b/include/llvm/Assembly/Writer.h
@@ -80,12 +80,12 @@ inline ostream &operator<<(ostream &o, const ConstPoolVal *I) {
 
 inline ostream &operator<<(ostream &o, const Type *T) {
   if (!T) return o << "<null Type>";
-  return o << T->getName();
+  return o << T->getDescription();
 }
 
 inline ostream &operator<<(ostream &o, const Value *I) {
   switch (I->getValueType()) {
-  case Value::TypeVal:        return o << (const Type*)I;
+  case Value::TypeVal:        return o << I->castTypeAsserting();
   case Value::ConstantVal:    WriteToAssembly((const ConstPoolVal*)I, o); break;
   case Value::MethodArgumentVal: return o <<I->getType() << " " << I->getName();
   case Value::InstructionVal: WriteToAssembly((const Instruction *)I, o); break;