diff --git a/clang/lib/CodeGen/CGVTables.cpp b/clang/lib/CodeGen/CGVTables.cpp
index 4743d57..1a210fa 100644
--- a/clang/lib/CodeGen/CGVTables.cpp
+++ b/clang/lib/CodeGen/CGVTables.cpp
@@ -263,7 +263,7 @@
   
   if (!const_cast<CXXRecordDecl *>(DerivedRD)->
       isDerivedFrom(const_cast<CXXRecordDecl *>(BaseRD), Paths)) {
-    assert(false && "Class must be derived from the passed in base class!");
+    llvm_unreachable("Class must be derived from the passed in base class!");
     return BaseOffset();
   }
 
@@ -303,7 +303,7 @@
     CanBaseReturnType = 
       CanBaseReturnType->getAs<PointerType>()->getPointeeType();
   } else {
-    assert(false && "Unexpected return type!");
+    llvm_unreachable("Unexpected return type!");
   }
   
   // We need to compare unqualified types here; consider
@@ -700,7 +700,7 @@
       return Offsets[I].second;
   }
   
-  assert(false && "Should always find a vcall offset offset!");
+  llvm_unreachable("Should always find a vcall offset offset!");
   return CharUnits::Zero();
 }
 
@@ -1361,7 +1361,7 @@
 
   if (!const_cast<CXXRecordDecl *>(DerivedRD)->
       isDerivedFrom(const_cast<CXXRecordDecl *>(BaseRD), Paths)) {
-    assert(false && "Class must be derived from the passed in base class!");
+    llvm_unreachable("Class must be derived from the passed in base class!");
     return BaseOffset();
   }
 
@@ -1553,7 +1553,7 @@
     }
     
     if (!PrimaryBases.insert(PrimaryBase))
-      assert(false && "Found a duplicate primary base!");
+      llvm_unreachable("Found a duplicate primary base!");
 
     RD = PrimaryBase;
   }
@@ -1627,7 +1627,7 @@
                FirstBaseOffsetInLayoutClass, PrimaryBases);
     
     if (!PrimaryBases.insert(PrimaryBase))
-      assert(false && "Found a duplicate primary base!");
+      llvm_unreachable("Found a duplicate primary base!");
   }
 
   // Now go through all virtual member functions and add them.
@@ -2316,7 +2316,7 @@
   CollectPrimaryBases(PrimaryBase, Context, PrimaryBases);
 
   if (!PrimaryBases.insert(PrimaryBase))
-    assert(false && "Found a duplicate primary base!");
+    llvm_unreachable("Found a duplicate primary base!");
 }
 
 void CodeGenVTables::ComputeMethodVTableIndices(const CXXRecordDecl *RD) {