diff --git a/include/llvm/Value.h b/include/llvm/Value.h
index e02cec132ea..8b6601d6959 100644
--- a/include/llvm/Value.h
+++ b/include/llvm/Value.h
@@ -165,7 +165,7 @@ public:
   }
 
   // Methods for support type inquiry through isa, cast, and dyn_cast:
-  static inline bool classof(const Value *V) {
+  static inline bool classof(const Value * /*V*/) {
     return true; // Values are always values.
   }
 
@@ -175,7 +175,7 @@ public:
 
 private:
   /// FIXME: this is a gross hack, needed by another gross hack.  Eliminate!
-  void setValueType(unsigned VT) { SubclassID = VT; }
+  void setValueType(unsigned short VT) { SubclassID = VT; }
   friend class Instruction;
 };