diff --git a/lib/Analysis/LiveVar/BBLiveVar.cpp b/lib/Analysis/LiveVar/BBLiveVar.cpp
index 66d9f32457d..5217bf52a58 100644
--- a/lib/Analysis/LiveVar/BBLiveVar.cpp
+++ b/lib/Analysis/LiveVar/BBLiveVar.cpp
@@ -116,7 +116,7 @@ void BBLiveVar::calcDefUseSets() {
       assert(MI->getOpCode() != PHI && "Phi cannot have implicit opeands");
       const Value *Op = MI->getImplicitRef(i);
 
-      if (Op->getType()->isLabelType())             // don't process labels
+      if (Op->getType() == Type::LabelTy)             // don't process labels
 	continue;
 
       if (!MI->implicitRefIsDefined(i))
diff --git a/lib/AsmParser/ParserInternals.h b/lib/AsmParser/ParserInternals.h
index 2291a5a975f..8b10c36e60f 100644
--- a/lib/AsmParser/ParserInternals.h
+++ b/lib/AsmParser/ParserInternals.h
@@ -170,7 +170,7 @@ struct InstPlaceHolderHelper : public Instruction {
 
 struct BBPlaceHolderHelper : public BasicBlock {
   BBPlaceHolderHelper(const Type *Ty) : BasicBlock() {
-    assert(Ty->isLabelType());
+    assert(Ty == Type::LabelTy);
   }
 };
 
diff --git a/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp b/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp
index 66d9f32457d..5217bf52a58 100644
--- a/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp
+++ b/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp
@@ -116,7 +116,7 @@ void BBLiveVar::calcDefUseSets() {
       assert(MI->getOpCode() != PHI && "Phi cannot have implicit opeands");
       const Value *Op = MI->getImplicitRef(i);
 
-      if (Op->getType()->isLabelType())             // don't process labels
+      if (Op->getType() == Type::LabelTy)             // don't process labels
 	continue;
 
       if (!MI->implicitRefIsDefined(i))